From bcfd431e9ab38c8156c117022378157dd61a76ec Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Mon, 22 Dec 2014 02:05:04 +0100 Subject: [PATCH] Frame: Fix a crash-on-exit on Mac OS X. A null pointer exception is triggered when Dolphin is quit from the dock. --- Source/Core/DolphinWX/Frame.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 3a0712f495..8c5b2c247d 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -577,7 +577,8 @@ void CFrame::OnClose(wxCloseEvent& event) else { // Close the log window now so that its settings are saved - m_LogWindow->Close(); + if (m_LogWindow) + m_LogWindow->Close(); m_LogWindow = nullptr; }