1 files changed, 10 insertions, 8 deletions
diff --git a/Source/Core/DolphinWX/LogWindow.cpp b/Source/Core/DolphinWX/LogWindow.cpp
index 940c647da1..1b47f16883 100644
--- a/Source/Core/DolphinWX/LogWindow.cpp
+++ b/Source/Core/DolphinWX/LogWindow.cpp
@@ -149,18 +149,20 @@ void CLogWindow::CreateGUIControls()
   m_cmdline->SetFocus();
 }
 
-CLogWindow::~CLogWindow()
-{
-  for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
-  {
-    m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, LogListener::LOG_WINDOW_LISTENER);
-  }
-}
-
 void CLogWindow::OnClose(wxCloseEvent& event)
 {
   SaveSettings();
   event.Skip();
+  RemoveAllListeners();
+}
+
+void CLogWindow::RemoveAllListeners()
+{
+  for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
+  {
+    m_LogManager->RemoveListener(static_cast<LogTypes::LOG_TYPE>(i),
+                                 LogListener::LOG_WINDOW_LISTENER);
+  }
 }
 
 void CLogWindow::SaveSettings()