summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2022-06-23 11:37:22 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2022-06-23 10:19:31 +0000
commitc1e4c4fde824a8ce67e26f4eaaedc21a84fcd172 (patch)
tree9b247272b860f41e54492398531bb6e70a4a6882 /src
parent1b89bcbf5e274d90737f3d0f0068164b4cb503ca (diff)
downloadqt-creator-c1e4c4fde824a8ce67e26f4eaaedc21a84fcd172.tar.gz
QbsProjectManager: Fix assertion when writing to non-running process
Amends b21ed19903d88f79967355d408aabfc6f9ab2af4. Change-Id: Ib4e8460d2e000faad49e08b39432a1c5ce6a017c Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/qbsprojectmanager/qbssession.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/qbsprojectmanager/qbssession.cpp b/src/plugins/qbsprojectmanager/qbssession.cpp
index bd2c3ecb49..746fd515bf 100644
--- a/src/plugins/qbsprojectmanager/qbssession.cpp
+++ b/src/plugins/qbsprojectmanager/qbssession.cpp
@@ -228,9 +228,10 @@ QbsSession::~QbsSession()
d->packetReader->disconnect(this);
if (d->qbsProcess) {
d->qbsProcess->disconnect(this);
- sendQuitPacket();
- if (d->qbsProcess->state() == QProcess::Running)
+ if (d->qbsProcess->state() == QProcess::Running) {
+ sendQuitPacket();
d->qbsProcess->waitForFinished(10000);
+ }
delete d->qbsProcess;
}
delete d;