From 456736d54819cecfa680b130a9fe7d15937187cf Mon Sep 17 00:00:00 2001 From: Arisotura Date: Sat, 9 Sep 2023 15:41:49 +0200 Subject: [PATCH] oh god git merge what the fuck --- src/frontend/qt_sdl/main.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp index 276733bc..d4646b0e 100644 --- a/src/frontend/qt_sdl/main.cpp +++ b/src/frontend/qt_sdl/main.cpp @@ -697,7 +697,6 @@ void EmuThread::emuRun() emit windowEmuStart(); AudioInOut::Enable(); IPC::SetActive(true); - IPC::SetActive(true); } void EmuThread::initContext() @@ -723,7 +722,6 @@ void EmuThread::emuPause() AudioInOut::Disable(); IPC::SetActive(false); - IPC::SetActive(false); } void EmuThread::emuUnpause() @@ -737,7 +735,6 @@ void EmuThread::emuUnpause() AudioInOut::Enable(); IPC::SetActive(true); - IPC::SetActive(true); } void EmuThread::emuStop() @@ -747,11 +744,11 @@ void EmuThread::emuStop() AudioInOut::Disable(); IPC::SetActive(false); - IPC::SetActive(false); } void EmuThread::emuFrameStep() { + if (EmuPauseStack < EmuPauseStackPauseThreshold) emit windowEmuPause(); if (EmuRunning != emuStatus_FrameStep) IPC::SetActive(false); EmuRunning = emuStatus_FrameStep; }