From 3f4d9fd23c73f184eef56df4fb4bc37356c32ed5 Mon Sep 17 00:00:00 2001 From: JordanTheToaster Date: Wed, 20 Mar 2024 16:36:52 +0000 Subject: [PATCH] Qt: Fix closing log window via taskbar --- pcsx2-qt/LogWindow.cpp | 7 +++++++ pcsx2-qt/LogWindow.h | 1 + 2 files changed, 8 insertions(+) diff --git a/pcsx2-qt/LogWindow.cpp b/pcsx2-qt/LogWindow.cpp index 81fb54716d..56d7b2f320 100644 --- a/pcsx2-qt/LogWindow.cpp +++ b/pcsx2-qt/LogWindow.cpp @@ -76,6 +76,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; @@ -88,6 +89,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; @@ -248,6 +250,11 @@ void LogWindow::logCallback(LOGLEVEL level, ConsoleColors color, std::string_vie void LogWindow::closeEvent(QCloseEvent* event) { + if (!m_destroying) + { + event->ignore(); + return; + } Log::SetHostOutputLevel(LOGLEVEL_NONE, nullptr); saveSize(); diff --git a/pcsx2-qt/LogWindow.h b/pcsx2-qt/LogWindow.h index 692d47b6d8..942ec3c231 100644 --- a/pcsx2-qt/LogWindow.h +++ b/pcsx2-qt/LogWindow.h @@ -48,6 +48,7 @@ private: QMenu* m_level_menu; bool m_attached_to_main_window = true; + bool m_destroying = false; }; extern LogWindow* g_log_window;