From 06f1761f9ff5a1deabfe744b78eb13e9760b178a Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Sun, 9 Jul 2017 18:36:22 -0700 Subject: [PATCH] LogWindow: don't unconfigure logger on destruction This was causing Dolphin to always save "WriteToWindow = False". Instead of disabling logging to the window (a config value), tell LogManager that there's no window to log to (a runtime state). --- Source/Core/DolphinWX/LogWindow.cpp | 6 +----- Source/Core/DolphinWX/LogWindow.h | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Source/Core/DolphinWX/LogWindow.cpp b/Source/Core/DolphinWX/LogWindow.cpp index 3de0469f30..7a716ebc21 100644 --- a/Source/Core/DolphinWX/LogWindow.cpp +++ b/Source/Core/DolphinWX/LogWindow.cpp @@ -129,11 +129,7 @@ CLogWindow::~CLogWindow() void CLogWindow::RemoveAllListeners() { - if (!m_has_listeners) - return; - m_has_listeners = false; - - m_LogManager->EnableListener(LogListener::LOG_WINDOW_LISTENER, false); + m_LogManager->RegisterListener(LogListener::LOG_WINDOW_LISTENER, nullptr); } void CLogWindow::SaveSettings() diff --git a/Source/Core/DolphinWX/LogWindow.h b/Source/Core/DolphinWX/LogWindow.h index 65b98a8b2b..9157288b66 100644 --- a/Source/Core/DolphinWX/LogWindow.h +++ b/Source/Core/DolphinWX/LogWindow.h @@ -46,7 +46,6 @@ private: LogManager* m_LogManager; std::queue> msgQueue; bool m_LogAccess; - bool m_has_listeners = true; // Controls wxBoxSizer* sBottom;