diff options
author | Christian Stenger <christian.stenger@qt.io> | 2023-05-10 12:32:05 +0200 |
---|---|---|
committer | Christian Stenger <christian.stenger@qt.io> | 2023-05-15 04:52:19 +0000 |
commit | 985c1ee3e9dc0298405e9400f7016d869ec4676e (patch) | |
tree | 38b8a7e9b96827116622414846692dda8e951e53 | |
parent | 64d1f49078b6b88b670149e33c5637070524359f (diff) | |
download | qt-creator-985c1ee3e9dc0298405e9400f7016d869ec4676e.tar.gz |
Perforce: Do not wait for process if not set up
The process could be not set up correctly or at all if
we exit the start function early.
Avoids a soft assert.
Change-Id: I9f0d71acc4a440b85dbb26fa656e0b551ae685f4
Reviewed-by: hjk <hjk@qt.io>
-rw-r--r-- | src/plugins/perforce/perforcechecker.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/perforce/perforcechecker.cpp b/src/plugins/perforce/perforcechecker.cpp index f9a5b5df38..cf63d9e691 100644 --- a/src/plugins/perforce/perforcechecker.cpp +++ b/src/plugins/perforce/perforcechecker.cpp @@ -26,8 +26,10 @@ PerforceChecker::PerforceChecker(QObject *parent) : QObject(parent) PerforceChecker::~PerforceChecker() { - m_process.kill(); - m_process.waitForFinished(); + if (m_process.isRunning()) { + m_process.kill(); + m_process.waitForFinished(); + } resetOverrideCursor(); } |