Merge pull request #5278 from spycrab/issue_10213

Lazily initialize m_main_config_dialog to fix analytics issue (Issue #10213)
This commit is contained in:
Mat M authored and GitHub committed 2017-04-16 07:12:29 -04:00
commit e53969b6f2
2 files changed
+2 -2

No files matched your search

-2
View File
@@ -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;
+2
View File
@@ -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);