diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-01-06 10:46:57 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-01-06 11:55:39 +0100 |
| commit | 65e8c864af2b7c0966c3797f296b62312d21a4c2 (patch) | |
| tree | 56952514173a1bbd5921f438b62ae5c82b8d1c31 /src/plugins/projectexplorer/appoutputpane.cpp | |
| parent | 2f71b49399f44f7f3bf57179f40cdbf17f043d9b (diff) | |
| parent | 243521380b3358d2e7c79cd49db7fb1e7e8db1ba (diff) | |
Merge remote-tracking branch 'origin/6.0'
Change-Id: I405e3f95b0cdcd7b2686f31baae16c03c787f007
Diffstat (limited to 'src/plugins/projectexplorer/appoutputpane.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/appoutputpane.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index c022e90e63..4920f77157 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/src/plugins/projectexplorer/appoutputpane.cpp @@ -605,9 +605,10 @@ void AppOutputPane::stopRunControl() RunControl *rc = m_runControlTabs.at(index).runControl; QTC_ASSERT(rc, return); - if (rc->isRunning() && optionallyPromptToStop(rc)) - rc->initiateStop(); - else { + if (rc->isRunning()) { + if (optionallyPromptToStop(rc)) + rc->initiateStop(); + } else { QTC_CHECK(false); rc->forceStop(); } |