summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2014-08-13 10:25:19 -0700
committerPierre Bourdon <delroth@gmail.com>2014-08-13 10:25:19 -0700
commite5ca4f604ce4696319b74012bb476889e7f099aa (patch)
tree9be0529d5036bc839cc6d1bf4ce685664ec55307 /Source
parentf2a1dd91fe7b94580534b4299803ef9e6cb60d04 (diff)
parente4c7cce412154695f33d850fc0b9321fecf4da55 (diff)
Merge pull request #793 from kamiyo/fixframetools
Update frametools.cpp to fix crashing when changing themes.
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/DolphinWX/FrameTools.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
index 1deb91a857..0baa25983a 100644
--- 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;