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

Fix crash on closing a tab of a asynchronously closing runcontrol

Browse Source 
Task-number: QTCREATORBUG-6579
Change-Id: Ia1d629df24e1a4c7f4f830f575d1be4adc552409
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Daniel Teske
2011-11-24 15:46:03 +01:00
parent cc11186bad
commit 3dc96ba1a8
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -427,7 +427,7 @@ bool AppOutputPane::closeTab(int index)
bool AppOutputPane::closeTab(int tabIndex, CloseTabMode closeTabMode) bool AppOutputPane::closeTab(int tabIndex, CloseTabMode closeTabMode)
{ {
const int index = indexOf(m_tabWidget->widget(tabIndex)); int index = indexOf(m_tabWidget->widget(tabIndex));
QTC_ASSERT(index != -1, return true;) QTC_ASSERT(index != -1, return true;)
RunControlTab &tab = m_runControlTabs[index]; RunControlTab &tab = m_runControlTabs[index];
@@ -441,13 +441,29 @@ bool AppOutputPane::closeTab(int tabIndex, CloseTabMode closeTabMode)
case CloseTabNoPrompt: case CloseTabNoPrompt:
break; break;
case CloseTabWithPrompt: case CloseTabWithPrompt:
QWidget *tabWidget = m_tabWidget->widget(tabIndex);
if (!tab.runControl->promptToStop()) if (!tab.runControl->promptToStop())
return false; return false;
// The event loop has run, thus the ordering might have changed, a tab might
// have been closed, so do some strange things...
tabIndex = m_tabWidget->indexOf(tabWidget);
index = indexOf(tabWidget);
if (tabIndex == -1 || index == -1)
return false;
tab = m_runControlTabs[index];
break; break;
} }
if (tab.runControl->stop() == RunControl::AsynchronousStop) { if (tab.runControl->isRunning()) { // yes it might have stopped already, then just close
tab.asyncClosing = true; QWidget *tabWidget = m_tabWidget->widget(tabIndex);
return false; if (tab.runControl->stop() == RunControl::AsynchronousStop) {
tab.asyncClosing = true;
return false;
}
tabIndex = m_tabWidget->indexOf(tabWidget);
index = indexOf(tabWidget);
if (tabIndex == -1 || index == -1)
return false;
tab = m_runControlTabs[index];
} }
} }