diff options
| author | Narr the Reg <juangerman-13@hotmail.com> | 2022-04-23 18:56:30 +0200 |
|---|---|---|
| committer | Narr the Reg <juangerman-13@hotmail.com> | 2022-04-23 21:24:28 +0200 |
| commit | 4de43e4d4a20217599e682306438ab6452207c6b (patch) | |
| tree | 62903903c67e8a3d9ea6d1fe6f0032af2a165bf7 /src | |
| parent | Merge pull request #8222 from german77/sixaxis_test (diff) | |
| download | yuzu-4de43e4d4a20217599e682306438ab6452207c6b.tar yuzu-4de43e4d4a20217599e682306438ab6452207c6b.tar.gz yuzu-4de43e4d4a20217599e682306438ab6452207c6b.tar.bz2 yuzu-4de43e4d4a20217599e682306438ab6452207c6b.tar.lz yuzu-4de43e4d4a20217599e682306438ab6452207c6b.tar.xz yuzu-4de43e4d4a20217599e682306438ab6452207c6b.tar.zst yuzu-4de43e4d4a20217599e682306438ab6452207c6b.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/main.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 5e26aad29..f607f464a 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -933,8 +933,9 @@ void GMainWindow::LinkActionShortcut(QAction* action, const QString& action_name auto* controller = system->HIDCore().GetEmulatedController(Core::HID::NpadIdType::Player1); const auto* controller_hotkey = hotkey_registry.GetControllerHotkey(main_window, action_name, controller); - connect(controller_hotkey, &ControllerShortcut::Activated, this, - [action] { action->trigger(); }); + connect( + controller_hotkey, &ControllerShortcut::Activated, this, [action] { action->trigger(); }, + Qt::QueuedConnection); } void GMainWindow::InitializeHotkeys() { @@ -961,7 +962,8 @@ void GMainWindow::InitializeHotkeys() { const auto* controller_hotkey = hotkey_registry.GetControllerHotkey(main_window, action_name, controller); connect(hotkey, &QShortcut::activated, this, function); - connect(controller_hotkey, &ControllerShortcut::Activated, this, function); + connect(controller_hotkey, &ControllerShortcut::Activated, this, function, + Qt::QueuedConnection); }; connect_shortcut(QStringLiteral("Exit Fullscreen"), [&] { |