diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-10-17 20:00:44 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-10-17 20:00:44 +0300 |
| commit | 371b2bbbab6b4bdc300ef7c3d4ce9c504ac25472 (patch) | |
| tree | 0987f23b83e9031e35fa84d9495ee4b538f87e81 /src/plugins/projectexplorer/appoutputpane.cpp | |
| parent | 5c554c0de9fd9115dbcfa010353640b11e349c6c (diff) | |
| parent | aa4e05f07b22b062316bf8a35517956c3770e0f6 (diff) | |
| download | qt-creator-371b2bbbab6b4bdc300ef7c3d4ce9c504ac25472.tar.gz | |
Merge remote-tracking branch 'origin/4.5' into master
Change-Id: Ibcdd1230b40d1ca7a414843ee0f9ae4cddb29f6f
Diffstat (limited to 'src/plugins/projectexplorer/appoutputpane.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/appoutputpane.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index 676b1de19b..fa4d4f1c19 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/src/plugins/projectexplorer/appoutputpane.cpp @@ -568,7 +568,7 @@ void AppOutputPane::closeTab(int tabIndex, CloseTabMode closeTabMode) // Prompt user to stop if (closeTabMode == CloseTabWithPrompt) { QWidget *tabWidget = m_tabWidget->widget(tabIndex); - if (!runControl->promptToStop()) + if (runControl->isRunning() && !runControl->promptToStop()) return; // The event loop has run, thus the ordering might have changed, a tab might // have been closed, so do some strange things... |