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

ProjectExplorer: On shutdown, delete runcontrols before singnaling done.

Browse Source 
Change-Id: I6860465e575b6751d804304377c16a513c24f20d
Reviewed-on: http://codereview.qt-project.org/5248
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
Daniel Teske
2011-09-20 16:49:02 +02:00
parent 85a1841f2c
commit 97b4bcfa6c
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/projectexplorer/appoutputpane.cpp
View File

@@ -301,7 +301,7 @@ void AppOutputPane::createNewOutputWindow(RunControl *rc)
connect(rc, SIGNAL(started()), connect(rc, SIGNAL(started()),
this, SLOT(runControlStarted())); this, SLOT(runControlStarted()));
connect(rc, SIGNAL(finished()), connect(rc, SIGNAL(finished()),
this, SLOT(runControlFinished())); this, SLOT(runControlFinished()), Qt::QueuedConnection);
connect(rc, SIGNAL(applicationProcessHandleChanged()), connect(rc, SIGNAL(applicationProcessHandleChanged()),
this, SLOT(enableButtons())); this, SLOT(enableButtons()));
connect(rc, SIGNAL(appendMessage(ProjectExplorer::RunControl*,QString,Utils::OutputFormat)), connect(rc, SIGNAL(appendMessage(ProjectExplorer::RunControl*,QString,Utils::OutputFormat)),
@@ -452,11 +452,7 @@ bool AppOutputPane::closeTab(int tabIndex, CloseTabMode closeTabMode)
} }
m_tabWidget->removeTab(tabIndex); m_tabWidget->removeTab(tabIndex);
if (tab.asyncClosing) { // We were invoked from its finished() signal.
tab.runControl->deleteLater();
} else {
delete tab.runControl; delete tab.runControl;
}
delete tab.window; delete tab.window;
m_runControlTabs.removeAt(index); m_runControlTabs.removeAt(index);
updateCloseActions(); updateCloseActions();