From 3e7bea97180d474b682cbb6e8263d4cae700b300 Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Wed, 28 Jul 2021 05:46:56 +0200 Subject: [PATCH] early-access version 1937 --- README.md | 2 +- src/input_common/tas/tas_input.cpp | 3 ++- src/yuzu/configuration/configure_vibration.cpp | 2 +- src/yuzu/main.cpp | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 13943dfc6..9e8d205db 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 1936. +This is the source code for early-access 1937. ## Legal Notice diff --git a/src/input_common/tas/tas_input.cpp b/src/input_common/tas/tas_input.cpp index a55100e33..777e8c7c0 100755 --- a/src/input_common/tas/tas_input.cpp +++ b/src/input_common/tas/tas_input.cpp @@ -316,7 +316,8 @@ void Tas::SwapToTasController() { continue; } - auto tas_param = Common::ParamPackage{{"pad", static_cast(index)}}; + Common::ParamPackage tas_param; + tas_param.Set("pad", static_cast(index)); auto button_mapping = GetButtonMappingForDevice(tas_param); auto analog_mapping = GetAnalogMappingForDevice(tas_param); auto& buttons = player.buttons; diff --git a/src/yuzu/configuration/configure_vibration.cpp b/src/yuzu/configuration/configure_vibration.cpp index 9d92c4949..46a0f3025 100755 --- a/src/yuzu/configuration/configure_vibration.cpp +++ b/src/yuzu/configuration/configure_vibration.cpp @@ -99,7 +99,7 @@ void ConfigureVibration::SetVibrationDevices(std::size_t player_index) { const auto guid = param.Get("guid", ""); const auto port = param.Get("port", ""); - if (engine.empty() || engine == "keyboard" || engine == "mouse") { + if (engine.empty() || engine == "keyboard" || engine == "mouse" || engine == "tas") { continue; } diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 080f0bf23..b134e997c 100755 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -1501,6 +1501,7 @@ void GMainWindow::ShutdownGame() { game_list->show(); } game_list->SetFilterFocus(); + tas_label->clear(); render_window->removeEventFilter(render_window); render_window->setAttribute(Qt::WA_Hover, false);