Qt: Fix possible crash when closing debugger

stenzek · Feb 22, 2023 · 4494a2c · 4494a2c
1 parent ccf9ca3
commit 4494a2c
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/duckstation-qt/debuggerwindow.cpp b/src/duckstation-qt/debuggerwindow.cpp
@@ -390,10 +390,11 @@ void DebuggerWindow::onMemorySearchStringChanged(const QString&)
 
 void DebuggerWindow::closeEvent(QCloseEvent* event)
 {
-  QMainWindow::closeEvent(event);
+  g_emu_thread->disconnect(this);
   g_emu_thread->setSystemPaused(true, true);
-  CPU::ClearBreakpoints();
+  Host::RunOnCPUThread(&CPU::ClearBreakpoints);
   g_emu_thread->setSystemPaused(false);
+  QMainWindow::closeEvent(event);
   emit closed();
 }
 
@@ -421,10 +422,9 @@ void DebuggerWindow::setupAdditionalUi()
 
 void DebuggerWindow::connectSignals()
 {
-  EmuThread* hi = g_emu_thread;
-  connect(hi, &EmuThread::systemPaused, this, &DebuggerWindow::onEmulationPaused);
-  connect(hi, &EmuThread::systemResumed, this, &DebuggerWindow::onEmulationResumed);
-  connect(hi, &EmuThread::debuggerMessageReported, this, &DebuggerWindow::onDebuggerMessageReported);
+  connect(g_emu_thread, &EmuThread::systemPaused, this, &DebuggerWindow::onEmulationPaused);
+  connect(g_emu_thread, &EmuThread::systemResumed, this, &DebuggerWindow::onEmulationResumed);
+  connect(g_emu_thread, &EmuThread::debuggerMessageReported, this, &DebuggerWindow::onDebuggerMessageReported);
 
   connect(m_ui.actionPause, &QAction::toggled, this, &DebuggerWindow::onPauseActionToggled);
   connect(m_ui.actionRunToCursor, &QAction::triggered, this, &DebuggerWindow::onRunToCursorTriggered);