summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/Frame.cpp
diff options
context:
space:
mode:
authorJules Blok <jules.blok@gmail.com>2014-12-22 02:05:04 +0100
committerJules Blok <jules.blok@gmail.com>2014-12-22 02:06:23 +0100
commitbcfd431e9ab38c8156c117022378157dd61a76ec (patch)
tree0093b25126b1e23a68ec4c43dd5e0ef142e9039d /Source/Core/DolphinWX/Frame.cpp
parent8cd23f5334940c11971474eb9f305f5bfd568dc8 (diff)
Frame: Fix a crash-on-exit on Mac OS X.
A null pointer exception is triggered when Dolphin is quit from the dock.
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
-rw-r--r--Source/Core/DolphinWX/Frame.cpp3
1 files changed, 2 insertions, 1 deletions
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;
}