ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

oh god git merge what the fuck

This commit is contained in:
Arisotura 2023-09-09 15:41:49 +02:00
parent 06ff560dfb
commit 456736d548
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/frontend/qt_sdl/main.cpp
View File

@ -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;
}