feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix crash on exit

Browse Source 
Fix crash happening when closing creator after the toolchain settings
were shown.

Change-Id: I4ed3b4cb0c3a2c303ba0d346d90fd275022457da
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Tobias Hunger
2012-08-20 15:06:55 +02:00
parent 7ec492f6ed
commit 19bfcc83af
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/projectexplorer/toolchainoptionspage.cpp
View File

@@ -484,7 +484,7 @@ QWidget *ToolChainOptionsPage::createPage(QWidget *parent)
horizontalLayout->addLayout(verticalLayout); horizontalLayout->addLayout(verticalLayout);
horizontalLayout->addLayout(buttonLayout); horizontalLayout->addLayout(buttonLayout);
Q_ASSERT(!m_model); Q_ASSERT(!m_model);
m_model = new ToolChainModel(verticalLayout); m_model = new ToolChainModel(m_configWidget);
connect(m_model, SIGNAL(toolChainStateChanged()), this, SLOT(updateState())); connect(m_model, SIGNAL(toolChainStateChanged()), this, SLOT(updateState()));
@@ -548,14 +548,16 @@ void ToolChainOptionsPage::apply()
void ToolChainOptionsPage::finish() void ToolChainOptionsPage::finish()
{ {
if (m_model) { disconnect(ToolChainManager::instance(), SIGNAL(toolChainsChanged()),
m_model->deleteLater(); this, SLOT(toolChainSelectionChanged()));
m_model = 0;
}
m_configWidget = 0; // deleted by settingsdialog // delete by settingsdialog;
m_selectionModel = 0; // child of m_configWidget m_configWidget = 0;
// childs of m_configWidget
// children of m_configWidget
m_model = 0;
m_container = 0;
m_selectionModel = 0;
m_toolChainView = 0; m_toolChainView = 0;
m_addButton = 0; m_addButton = 0;
m_cloneButton = 0; m_cloneButton = 0;