do not access NDS object emulation is paused

melonDS-emu · Dec 22, 2023 · 989b93c · 989b93c
1 parent 521fc24
commit 989b93c
Showing 1 changed file with 51 additions and 51 deletions.
diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp
@@ -592,68 +592,68 @@ void EmuThread::run()
         if (Input::HotkeyPressed(HK_SwapScreens)) emit swapScreensToggle();
         if (Input::HotkeyPressed(HK_SwapScreenEmphasis)) emit screenEmphasisToggle();
 
-        if (Input::HotkeyPressed(HK_SolarSensorDecrease))
-        {
-            int level = NDS->GBACartSlot.SetInput(GBACart::Input_SolarSensorDown, true);
-            if (level != -1)
-            {
-                char msg[64];
-                sprintf(msg, "Solar sensor level: %d", level);
-                OSD::AddMessage(0, msg);
-            }
-        }
-        if (Input::HotkeyPressed(HK_SolarSensorIncrease))
-        {
-            int level = NDS->GBACartSlot.SetInput(GBACart::Input_SolarSensorUp, true);
-            if (level != -1)
-            {
-                char msg[64];
-                sprintf(msg, "Solar sensor level: %d", level);
-                OSD::AddMessage(0, msg);
-            }
-        }
-
-        if (NDS->ConsoleType == 1)
+        if (EmuRunning == emuStatus_Running || EmuRunning == emuStatus_FrameStep)
         {
-            DSi& dsi = static_cast<DSi&>(*NDS);
-            double currentTime = SDL_GetPerformanceCounter() * perfCountsSec;
+            EmuStatus = emuStatus_Running;
+            if (EmuRunning == emuStatus_FrameStep) EmuRunning = emuStatus_Paused;
 
-            // Handle power button
-            if (Input::HotkeyDown(HK_PowerButton))
+            if (Input::HotkeyPressed(HK_SolarSensorDecrease))
             {
-                dsi.I2C.GetBPTWL()->SetPowerButtonHeld(currentTime);
+                int level = NDS->GBACartSlot.SetInput(GBACart::Input_SolarSensorDown, true);
+                if (level != -1)
+                {
+                    char msg[64];
+                    sprintf(msg, "Solar sensor level: %d", level);
+                    OSD::AddMessage(0, msg);
+                }
             }
-            else if (Input::HotkeyReleased(HK_PowerButton))
+            if (Input::HotkeyPressed(HK_SolarSensorIncrease))
             {
-                dsi.I2C.GetBPTWL()->SetPowerButtonReleased(currentTime);
+                int level = NDS->GBACartSlot.SetInput(GBACart::Input_SolarSensorUp, true);
+                if (level != -1)
+                {
+                    char msg[64];
+                    sprintf(msg, "Solar sensor level: %d", level);
+                    OSD::AddMessage(0, msg);
+                }
             }
 
-            // Handle volume buttons
-            if (Input::HotkeyDown(HK_VolumeUp))
+            if (NDS->ConsoleType == 1)
             {
-                dsi.I2C.GetBPTWL()->SetVolumeSwitchHeld(DSi_BPTWL::volumeKey_Up);
-            }
-            else if (Input::HotkeyReleased(HK_VolumeUp))
-            {
-                dsi.I2C.GetBPTWL()->SetVolumeSwitchReleased(DSi_BPTWL::volumeKey_Up);
-            }
+                DSi& dsi = static_cast<DSi&>(*NDS);
+                double currentTime = SDL_GetPerformanceCounter() * perfCountsSec;
 
-            if (Input::HotkeyDown(HK_VolumeDown))
-            {
-                dsi.I2C.GetBPTWL()->SetVolumeSwitchHeld(DSi_BPTWL::volumeKey_Down);
-            }
-            else if (Input::HotkeyReleased(HK_VolumeDown))
-            {
-                dsi.I2C.GetBPTWL()->SetVolumeSwitchReleased(DSi_BPTWL::volumeKey_Down);
-            }
+                // Handle power button
+                if (Input::HotkeyDown(HK_PowerButton))
+                {
+                    dsi.I2C.GetBPTWL()->SetPowerButtonHeld(currentTime);
+                }
+                else if (Input::HotkeyReleased(HK_PowerButton))
+                {
+                    dsi.I2C.GetBPTWL()->SetPowerButtonReleased(currentTime);
+                }
 
-            dsi.I2C.GetBPTWL()->ProcessVolumeSwitchInput(currentTime);
-        }
+                // Handle volume buttons
+                if (Input::HotkeyDown(HK_VolumeUp))
+                {
+                    dsi.I2C.GetBPTWL()->SetVolumeSwitchHeld(DSi_BPTWL::volumeKey_Up);
+                }
+                else if (Input::HotkeyReleased(HK_VolumeUp))
+                {
+                    dsi.I2C.GetBPTWL()->SetVolumeSwitchReleased(DSi_BPTWL::volumeKey_Up);
+                }
 
-        if (EmuRunning == emuStatus_Running || EmuRunning == emuStatus_FrameStep)
-        {
-            EmuStatus = emuStatus_Running;
-            if (EmuRunning == emuStatus_FrameStep) EmuRunning = emuStatus_Paused;
+                if (Input::HotkeyDown(HK_VolumeDown))
+                {
+                    dsi.I2C.GetBPTWL()->SetVolumeSwitchHeld(DSi_BPTWL::volumeKey_Down);
+                }
+                else if (Input::HotkeyReleased(HK_VolumeDown))
+                {
+                    dsi.I2C.GetBPTWL()->SetVolumeSwitchReleased(DSi_BPTWL::volumeKey_Down);
+                }
+
+                dsi.I2C.GetBPTWL()->ProcessVolumeSwitchInput(currentTime);
+            }
 
             // update render settings if needed
             // HACK: