Merge pull request #5278 from spycrab/issue_10213

Lazily initialize m_main_config_dialog to fix analytics issue (Issue #10213)
dolphin-emu · Apr 16, 2017 · e53969b · e53969b
2 parents feefe15 + 01e07d7
commit e53969b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
@@ -321,8 +321,6 @@ CFrame::CFrame(wxFrame* parent, wxWindowID id, const wxString& title, wxRect geo
 {
   BindEvents();
 
-  m_main_config_dialog = new CConfigMain(this);
-
   for (int i = 0; i <= IDM_CODE_WINDOW - IDM_LOG_WINDOW; i++)
     bFloatWindow[i] = false;
 

diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
@@ -259,6 +259,8 @@ wxToolBar* CFrame::OnCreateToolBar(long style, wxWindowID id, const wxString& na
 
 void CFrame::OpenGeneralConfiguration(wxWindowID tab_id)
 {
+  if (!m_main_config_dialog)
+    m_main_config_dialog = new CConfigMain(this);
   if (tab_id > wxID_ANY)
     m_main_config_dialog->SetSelectedTab(tab_id);