From 8b041e9a2315ebed008d92bbf7b2aa3fce19a582 Mon Sep 17 00:00:00 2001 From: yeah-its-gloria <32610623+yeah-its-gloria@users.noreply.github.com> Date: Mon, 3 Jun 2024 19:49:23 -0400 Subject: [PATCH] Qt: Ignore rewind while loading/saving states --- src/platform/qt/Window.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index a5576c1c9..010dde782 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -1464,6 +1464,11 @@ void Window::setupMenu(QMenuBar* menubar) { }, "emu"); auto rewindHeld = m_actions.addHeldAction(tr("Rewind (held)"), "holdRewind", [this](bool held) { + // Prevent rewinding while the load/save state window is active + if (held && this->m_stateWindow != nullptr) { + return; + } + if (m_controller) { m_controller->setRewinding(held); }