diff options
| -rw-r--r-- | .ci/scripts/merge/apply-patches-by-label-private.py | 2 | ||||
| -rw-r--r-- | .ci/scripts/merge/apply-patches-by-label.py | 2 | ||||
| -rw-r--r-- | src/yuzu/hotkeys.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/main.cpp | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/.ci/scripts/merge/apply-patches-by-label-private.py b/.ci/scripts/merge/apply-patches-by-label-private.py index fe0acd510..16b45043e 100644 --- a/.ci/scripts/merge/apply-patches-by-label-private.py +++ b/.ci/scripts/merge/apply-patches-by-label-private.py @@ -25,7 +25,7 @@ def check_individual(repo_id, pr_id): def merge_pr(pn, ref): print("Matched PR# %s" % pn) - print(subprocess.check_output(["git", "fetch", "https://%sdev.azure.com/%s/_git/%s" % (user, org, repo), ref, "-f"])) + print(subprocess.check_output(["git", "fetch", "https://%sdev.azure.com/%s/_git/%s" % (user, org, repo), ref, "-f", "--no-recurse-submodules"])) print(subprocess.check_output(["git", "merge", "--squash", 'origin/' + ref.replace('refs/heads/','')])) print(subprocess.check_output(["git", "commit", "-m\"Merge %s PR %s\"" % (tagline, pn)])) diff --git a/.ci/scripts/merge/apply-patches-by-label.py b/.ci/scripts/merge/apply-patches-by-label.py index b2e430ac7..c288a70a1 100644 --- a/.ci/scripts/merge/apply-patches-by-label.py +++ b/.ci/scripts/merge/apply-patches-by-label.py @@ -25,7 +25,7 @@ def do_page(page): if (check_individual(pr["labels"])): pn = pr["number"] print("Matched PR# %s" % pn) - print(subprocess.check_output(["git", "fetch", "https://github.com/yuzu-emu/yuzu.git", "pull/%s/head:pr-%s" % (pn, pn), "-f"])) + print(subprocess.check_output(["git", "fetch", "https://github.com/yuzu-emu/yuzu.git", "pull/%s/head:pr-%s" % (pn, pn), "-f", "--no-recurse-submodules"])) print(subprocess.check_output(["git", "merge", "--squash", "pr-%s" % pn])) print(subprocess.check_output(["git", "commit", "-m\"Merge %s PR %s\"" % (tagline, pn)])) diff --git a/src/yuzu/hotkeys.cpp b/src/yuzu/hotkeys.cpp index d4e97fa16..e7e58f314 100644 --- a/src/yuzu/hotkeys.cpp +++ b/src/yuzu/hotkeys.cpp @@ -46,6 +46,8 @@ QShortcut* HotkeyRegistry::GetHotkey(const QString& group, const QString& action if (!hk.shortcut) hk.shortcut = new QShortcut(hk.keyseq, widget, nullptr, nullptr, hk.context); + hk.shortcut->setAutoRepeat(false); + return hk.shortcut; } 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(); } |