sa2: stop debugging when the debug window is closed.

Closes audetto#122 Signed-off-by: Andrea Odetti <[email protected]>
sh95014 · Dec 22, 2023 · b8ad971 · b8ad971
1 parent 2cb74b2
commit b8ad971
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/source/frontends/sdl/imgui/sdldebugger.cpp b/source/frontends/sdl/imgui/sdldebugger.cpp
@@ -287,9 +287,22 @@ namespace sa2
         }
       }
     }
+
+    if (!showDebugger)
+    {
+      // this happes when the window is closed
+      syncDebuggerState(frame);
+    }
+
     ImGui::End();
   }
 
+  void ImGuiDebugger::syncDebuggerState(SDLFrame * frame)
+  {
+    const AppMode_e mode = showDebugger ? MODE_DEBUG : MODE_RUNNING;
+    frame->ChangeMode(mode);
+  }
+
   void ImGuiDebugger::debuggerCommand(SDLFrame * frame, const char * s)
   {
     for (; *s; ++s)

diff --git a/source/frontends/sdl/imgui/sdldebugger.h b/source/frontends/sdl/imgui/sdldebugger.h
@@ -16,6 +16,9 @@ namespace sa2
 
     void drawDebugger(SDLFrame* frame);
     void resetDebuggerCycles();
+
+    void syncDebuggerState(SDLFrame* frame);
+
   private:
     bool mySyncCPU = true;
 

diff --git a/source/frontends/sdl/imgui/sdlsettings.cpp b/source/frontends/sdl/imgui/sdlsettings.cpp
@@ -77,9 +77,9 @@ namespace sa2
           ImGui::Checkbox("Memory", &myShowMemory);
           ImGui::SameLine(); HelpMarker("Show Apple memory.");
 
-          if (ImGui::Checkbox("Debugger", &myDebugger.showDebugger) && myDebugger.showDebugger)
+          if (ImGui::Checkbox("Debugger", &myDebugger.showDebugger))
           {
-            frame->ChangeMode(MODE_DEBUG);
+            myDebugger.syncDebuggerState(frame);
           }
           ImGui::SameLine(); HelpMarker("Show Apple CPU.");
 
@@ -738,9 +738,9 @@ namespace sa2
       {
         ImGui::MenuItem("Settings", nullptr, &myShowSettings);
         ImGui::MenuItem("Memory", nullptr, &myShowMemory);
-        if (ImGui::MenuItem("Debugger", nullptr, &myDebugger.showDebugger) && myDebugger.showDebugger)
+        if (ImGui::MenuItem("Debugger", nullptr, &myDebugger.showDebugger))
         {
-          frame->ChangeMode(MODE_DEBUG);
+          myDebugger.syncDebuggerState(frame);
         }
         ImGui::EndMenu();
       }