summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishal Sharma <sharmavishal94@gmail.com>2018-02-27 06:03:03 +0100
committerbunnei <bunneidev@gmail.com>2018-02-27 06:03:02 +0100
commit65f3119074f4cb6a07af747b9c9d8445e08ccc50 (patch)
treebd5679594c88db819152568af15f0696d0d40f60
parentMerge pull request #207 from mailwl/duplicatesession (diff)
downloadyuzu-65f3119074f4cb6a07af747b9c9d8445e08ccc50.tar
yuzu-65f3119074f4cb6a07af747b9c9d8445e08ccc50.tar.gz
yuzu-65f3119074f4cb6a07af747b9c9d8445e08ccc50.tar.bz2
yuzu-65f3119074f4cb6a07af747b9c9d8445e08ccc50.tar.lz
yuzu-65f3119074f4cb6a07af747b9c9d8445e08ccc50.tar.xz
yuzu-65f3119074f4cb6a07af747b9c9d8445e08ccc50.tar.zst
yuzu-65f3119074f4cb6a07af747b9c9d8445e08ccc50.zip
-rw-r--r--src/yuzu/main.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index e5252abdc..5802b9855 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -187,7 +187,8 @@ void GMainWindow::InitializeHotkeys() {
RegisterHotkey("Main Window", "Load File", QKeySequence::Open);
RegisterHotkey("Main Window", "Start Emulation");
RegisterHotkey("Main Window", "Fullscreen", QKeySequence::FullScreen);
- RegisterHotkey("Main Window", "Exit Fullscreen", QKeySequence::Cancel, Qt::ApplicationShortcut);
+ RegisterHotkey("Main Window", "Exit Fullscreen", QKeySequence(Qt::Key_Escape),
+ Qt::ApplicationShortcut);
LoadHotkeys();
connect(GetHotkey("Main Window", "Load File", this), &QShortcut::activated, this,