diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2016-04-29 16:52:58 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2016-05-11 10:04:38 +0000 |
| commit | ddefe062c73e35def585f8fc6c90a4f18e47c0f4 (patch) | |
| tree | 03c3aecc501c03b92e259fe0ae1c4d472033b7e5 /src/plugins/perforce | |
| parent | 1a248b1b932e2c7c42e25993d921e78c52aa4bcf (diff) | |
Fix up QProcess::waitForFinished()
waitForFinish returns false if the process is no longer running at
the time of the call. Handle that throughout the codebase.
Change-Id: Ia7194095454e82efbd4eb88f2d55926bdd09e094
Reviewed-by: hjk <hjk@theqtcompany.com>
Diffstat (limited to 'src/plugins/perforce')
| -rw-r--r-- | src/plugins/perforce/perforcechecker.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/perforce/perforcechecker.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/perforce/perforcechecker.cpp b/src/plugins/perforce/perforcechecker.cpp index 7c8c27e780d..b7f5f56ccb5 100644 --- a/src/plugins/perforce/perforcechecker.cpp +++ b/src/plugins/perforce/perforcechecker.cpp @@ -59,9 +59,9 @@ bool PerforceChecker::isRunning() const return m_process.state() == QProcess::Running; } -bool PerforceChecker::waitForFinished(int msec) +bool PerforceChecker::waitForFinished() { - return m_process.waitForFinished(msec); + return m_process.waitForFinished() || m_process.state() == QProcess::NotRunning; } void PerforceChecker::resetOverrideCursor() diff --git a/src/plugins/perforce/perforcechecker.h b/src/plugins/perforce/perforcechecker.h index b8680959833..e1a7ec67b69 100644 --- a/src/plugins/perforce/perforcechecker.h +++ b/src/plugins/perforce/perforcechecker.h @@ -49,7 +49,7 @@ public: bool isRunning() const; - bool waitForFinished(int msec = -1); + bool waitForFinished(); bool useOverideCursor() const; void setUseOverideCursor(bool v); |