Merge pull request #793 from kamiyo/fixframetools

Update frametools.cpp to fix crashing when changing themes.
dolphin-emu · Aug 13, 2014 · e5ca4f6 · e5ca4f6
2 parents f2a1dd9 + e4c7cce
commit e5ca4f6
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
@@ -536,6 +536,7 @@ void CFrame::RecreateToolbar()
 	{
 		m_Mgr->DetachPane(m_ToolBar);
 		m_ToolBar->Destroy();
+		m_ToolBar = nullptr;
 	}
 
 	long TOOLBAR_STYLE = wxTB_DEFAULT_STYLE | wxTB_TEXT;