summaryrefslogtreecommitdiff
path: root/src/yuzu/main.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-11-18 11:26:28 -0800
committerGitHub <noreply@github.com>2021-11-18 11:26:28 -0800
commita100f5d5d4e50449bd295af313b7c36fef038312 (patch)
tree567be39b64bab4efd9d26c773121117a3e17433c /src/yuzu/main.cpp
parent66fed9ecbdf2124295e0648487f0ed509590c0d5 (diff)
parentf7e0a377536cc7e84c81173bd54ac2a45b39addf (diff)
Merge pull request #7353 from v1993/no-more-epilepsy
Prevent window flickering when holding Esc
Diffstat (limited to 'src/yuzu/main.cpp')
-rw-r--r--src/yuzu/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index d057dc889..6071a222f 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -1031,7 +1031,7 @@ void GMainWindow::InitializeHotkeys() {
&QShortcut::activatedAmbiguously, ui->action_Fullscreen, &QAction::trigger);
connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Exit Fullscreen"), this),
&QShortcut::activated, this, [&] {
- if (emulation_running) {
+ if (emulation_running && ui->action_Fullscreen->isChecked()) {
ui->action_Fullscreen->setChecked(false);
ToggleFullscreen();
}