oh god git merge what the fuck
This commit is contained in:
parent
06ff560dfb
commit
456736d548
|
@ -697,7 +697,6 @@ void EmuThread::emuRun()
|
||||||
emit windowEmuStart();
|
emit windowEmuStart();
|
||||||
AudioInOut::Enable();
|
AudioInOut::Enable();
|
||||||
IPC::SetActive(true);
|
IPC::SetActive(true);
|
||||||
IPC::SetActive(true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void EmuThread::initContext()
|
void EmuThread::initContext()
|
||||||
|
@ -723,7 +722,6 @@ void EmuThread::emuPause()
|
||||||
|
|
||||||
AudioInOut::Disable();
|
AudioInOut::Disable();
|
||||||
IPC::SetActive(false);
|
IPC::SetActive(false);
|
||||||
IPC::SetActive(false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void EmuThread::emuUnpause()
|
void EmuThread::emuUnpause()
|
||||||
|
@ -737,7 +735,6 @@ void EmuThread::emuUnpause()
|
||||||
|
|
||||||
AudioInOut::Enable();
|
AudioInOut::Enable();
|
||||||
IPC::SetActive(true);
|
IPC::SetActive(true);
|
||||||
IPC::SetActive(true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void EmuThread::emuStop()
|
void EmuThread::emuStop()
|
||||||
|
@ -747,11 +744,11 @@ void EmuThread::emuStop()
|
||||||
|
|
||||||
AudioInOut::Disable();
|
AudioInOut::Disable();
|
||||||
IPC::SetActive(false);
|
IPC::SetActive(false);
|
||||||
IPC::SetActive(false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void EmuThread::emuFrameStep()
|
void EmuThread::emuFrameStep()
|
||||||
{
|
{
|
||||||
|
if (EmuPauseStack < EmuPauseStackPauseThreshold) emit windowEmuPause();
|
||||||
if (EmuRunning != emuStatus_FrameStep) IPC::SetActive(false);
|
if (EmuRunning != emuStatus_FrameStep) IPC::SetActive(false);
|
||||||
EmuRunning = emuStatus_FrameStep;
|
EmuRunning = emuStatus_FrameStep;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue