summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-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
933 auto* controller = system->HIDCore().GetEmulatedController(Core::HID::NpadIdType::Player1); 933 auto* controller = system->HIDCore().GetEmulatedController(Core::HID::NpadIdType::Player1);
934 const auto* controller_hotkey = 934 const auto* controller_hotkey =
935 hotkey_registry.GetControllerHotkey(main_window, action_name, controller); 935 hotkey_registry.GetControllerHotkey(main_window, action_name, controller);
936 connect(controller_hotkey, &ControllerShortcut::Activated, this, 936 connect(
937 [action] { action->trigger(); }); 937 controller_hotkey, &ControllerShortcut::Activated, this, [action] { action->trigger(); },
938 Qt::QueuedConnection);
938} 939}
939 940
940void GMainWindow::InitializeHotkeys() { 941void GMainWindow::InitializeHotkeys() {
@@ -961,7 +962,8 @@ void GMainWindow::InitializeHotkeys() {
961 const auto* controller_hotkey = 962 const auto* controller_hotkey =
962 hotkey_registry.GetControllerHotkey(main_window, action_name, controller); 963 hotkey_registry.GetControllerHotkey(main_window, action_name, controller);
963 connect(hotkey, &QShortcut::activated, this, function); 964 connect(hotkey, &QShortcut::activated, this, function);
964 connect(controller_hotkey, &ControllerShortcut::Activated, this, function); 965 connect(controller_hotkey, &ControllerShortcut::Activated, this, function,
966 Qt::QueuedConnection);
965 }; 967 };
966 968
967 connect_shortcut(QStringLiteral("Exit Fullscreen"), [&] { 969 connect_shortcut(QStringLiteral("Exit Fullscreen"), [&] {