From 97b4bcfa6c98a0a3a4dcc6dc6315513f27b7a976 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Tue, 20 Sep 2011 16:49:02 +0200 Subject: [PATCH] ProjectExplorer: On shutdown, delete runcontrols before singnaling done. Change-Id: I6860465e575b6751d804304377c16a513c24f20d Reviewed-on: http://codereview.qt-project.org/5248 Reviewed-by: Qt Sanity Bot Reviewed-by: Kai Koehne --- src/plugins/projectexplorer/appoutputpane.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index 3cd6cf6ce1..3672a3bf61 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/src/plugins/projectexplorer/appoutputpane.cpp @@ -301,7 +301,7 @@ void AppOutputPane::createNewOutputWindow(RunControl *rc) connect(rc, SIGNAL(started()), this, SLOT(runControlStarted())); connect(rc, SIGNAL(finished()), - this, SLOT(runControlFinished())); + this, SLOT(runControlFinished()), Qt::QueuedConnection); connect(rc, SIGNAL(applicationProcessHandleChanged()), this, SLOT(enableButtons())); connect(rc, SIGNAL(appendMessage(ProjectExplorer::RunControl*,QString,Utils::OutputFormat)), @@ -452,11 +452,7 @@ bool AppOutputPane::closeTab(int tabIndex, CloseTabMode closeTabMode) } 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; m_runControlTabs.removeAt(index); updateCloseActions(); -- GitLab