Merge pull request #1755 from Armada651/master

Frame: Fix a crash-on-exit on Mac OS X.
2014-12-21 20:04:48 -06:00 · 2014-12-21 20:04:48 -06:00 · 9ec4a64c54
parent 8cd23f5334 bcfd431e9a
commit 9ec4a64c54
1 changed files with 2 additions and 1 deletions
--- 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;
 	}