piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-23 06:10:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

do not access NDS object emulation is paused

Browse Source
This commit is contained in:
RSDuck
2023-12-22 23:30:59 +01:00
parent 521fc249a3
commit 989b93c92a
1 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -592,6 +592,11 @@ void EmuThread::run()
if (Input::HotkeyPressed(HK_SwapScreens)) emit swapScreensToggle(); if (Input::HotkeyPressed(HK_SwapScreens)) emit swapScreensToggle();
if (Input::HotkeyPressed(HK_SwapScreenEmphasis)) emit screenEmphasisToggle(); if (Input::HotkeyPressed(HK_SwapScreenEmphasis)) emit screenEmphasisToggle();
if (EmuRunning == emuStatus_Running || EmuRunning == emuStatus_FrameStep)
{
EmuStatus = emuStatus_Running;
if (EmuRunning == emuStatus_FrameStep) EmuRunning = emuStatus_Paused;
if (Input::HotkeyPressed(HK_SolarSensorDecrease)) if (Input::HotkeyPressed(HK_SolarSensorDecrease))
{ {
int level = NDS->GBACartSlot.SetInput(GBACart::Input_SolarSensorDown, true); int level = NDS->GBACartSlot.SetInput(GBACart::Input_SolarSensorDown, true);
@ -650,11 +655,6 @@ void EmuThread::run()
dsi.I2C.GetBPTWL()->ProcessVolumeSwitchInput(currentTime); dsi.I2C.GetBPTWL()->ProcessVolumeSwitchInput(currentTime);
} }
if (EmuRunning == emuStatus_Running || EmuRunning == emuStatus_FrameStep)
{
EmuStatus = emuStatus_Running;
if (EmuRunning == emuStatus_FrameStep) EmuRunning = emuStatus_Paused;
// update render settings if needed // update render settings if needed
// HACK: // HACK:
// once the fast forward hotkey is released, we need to update vsync // once the fast forward hotkey is released, we need to update vsync