summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2022-04-23 22:21:23 +0200
committerGitHub <noreply@github.com>2022-04-23 22:21:23 +0200
commit7f77aafe41051c5fa8c7729e8743af2c09f3365e (patch)
treea0f78bf751ec52fb78cbd49b1d492aac9800074d
parentMerge pull request #8243 from lat9nq/boost-just-error (diff)
parenthotkeys: Trigger actions on a separate thread (diff)
downloadyuzu-7f77aafe41051c5fa8c7729e8743af2c09f3365e.tar
yuzu-7f77aafe41051c5fa8c7729e8743af2c09f3365e.tar.gz
yuzu-7f77aafe41051c5fa8c7729e8743af2c09f3365e.tar.bz2
yuzu-7f77aafe41051c5fa8c7729e8743af2c09f3365e.tar.lz
yuzu-7f77aafe41051c5fa8c7729e8743af2c09f3365e.tar.xz
yuzu-7f77aafe41051c5fa8c7729e8743af2c09f3365e.tar.zst
yuzu-7f77aafe41051c5fa8c7729e8743af2c09f3365e.zip
-rw-r--r--src/yuzu/main.cpp8
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"), [&] {