diff options
| author | 2021-11-18 11:26:28 -0800 | |
|---|---|---|
| committer | 2021-11-18 11:26:28 -0800 | |
| commit | a100f5d5d4e50449bd295af313b7c36fef038312 (patch) | |
| tree | 567be39b64bab4efd9d26c773121117a3e17433c /src | |
| parent | Merge pull request #7348 from Morph1984/ci-disable-submodule-fetch (diff) | |
| parent | Prevent window flickering when holding Esc (diff) | |
| download | yuzu-a100f5d5d4e50449bd295af313b7c36fef038312.tar.gz yuzu-a100f5d5d4e50449bd295af313b7c36fef038312.tar.xz yuzu-a100f5d5d4e50449bd295af313b7c36fef038312.zip | |
Merge pull request #7353 from v1993/no-more-epilepsy
Prevent window flickering when holding Esc
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/main.cpp | 2 |
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() { | |||
| 1031 | &QShortcut::activatedAmbiguously, ui->action_Fullscreen, &QAction::trigger); | 1031 | &QShortcut::activatedAmbiguously, ui->action_Fullscreen, &QAction::trigger); |
| 1032 | connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Exit Fullscreen"), this), | 1032 | connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Exit Fullscreen"), this), |
| 1033 | &QShortcut::activated, this, [&] { | 1033 | &QShortcut::activated, this, [&] { |
| 1034 | if (emulation_running) { | 1034 | if (emulation_running && ui->action_Fullscreen->isChecked()) { |
| 1035 | ui->action_Fullscreen->setChecked(false); | 1035 | ui->action_Fullscreen->setChecked(false); |
| 1036 | ToggleFullscreen(); | 1036 | ToggleFullscreen(); |
| 1037 | } | 1037 | } |