Qt: Fix closing log window via taskbar

stenzek · Mar 20, 2024 · 2be8287 · 2be8287
1 parent bcc7ab7
commit 2be8287
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/duckstation-qt/logwindow.cpp b/src/duckstation-qt/logwindow.cpp
@@ -59,6 +59,7 @@ void LogWindow::updateSettings()
   }
   else if (g_log_window)
   {
+    g_log_window->m_destroying = true;
     g_log_window->close();
     g_log_window->deleteLater();
     g_log_window = nullptr;
@@ -70,6 +71,7 @@ void LogWindow::destroy()
   if (!g_log_window)
     return;
 
+  g_log_window->m_destroying = true;
   g_log_window->close();
   g_log_window->deleteLater();
   g_log_window = nullptr;
@@ -306,6 +308,12 @@ void LogWindow::logCallback(void* pUserParam, const char* channelName, const cha
 
 void LogWindow::closeEvent(QCloseEvent* event)
 {
+  if (!m_destroying)
+  {
+    event->ignore();
+    return;
+  }
+
   Log::UnregisterCallback(&LogWindow::logCallback, this);
 
   saveSize();

diff --git a/src/duckstation-qt/logwindow.h b/src/duckstation-qt/logwindow.h
@@ -55,6 +55,7 @@ private Q_SLOTS:
   std::span<const char*> m_filter_names;
 
   bool m_attached_to_main_window = true;
+  bool m_destroying = false;
 };
 
 extern LogWindow* g_log_window;