diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-21 10:58:20 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-11-21 10:58:21 +0100 |
commit | 7e360ccd4e4a9afe58bd2ded5d8f602bcbce07aa (patch) | |
tree | 792d541477deeea69dd82b60506e2d29c5a4f1d9 /src/corelib | |
parent | 4ee85ff7c5db7aa228a30a9dc2a52d5d37089241 (diff) | |
parent | 4d8ae444c2b15ec7da5ef133aa5ad5a548180e21 (diff) |
Merge remote-tracking branch 'origin/5.9.3' into 5.10.0
Change-Id: I3224e0b877ec24b587e299083feb793518b0568c
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/thread/qsemaphore.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/corelib/thread/qsemaphore.cpp b/src/corelib/thread/qsemaphore.cpp index 96c031eec6..37736b3960 100644 --- a/src/corelib/thread/qsemaphore.cpp +++ b/src/corelib/thread/qsemaphore.cpp @@ -217,13 +217,15 @@ bool QSemaphore::tryAcquire(int n) bool QSemaphore::tryAcquire(int n, int timeout) { Q_ASSERT_X(n >= 0, "QSemaphore::tryAcquire", "parameter 'n' must be non-negative"); - if (timeout < 0) - return tryAcquire(n); + + // We're documented to accept any negative value as "forever" + // but QDeadlineTimer only accepts -1. + timeout = qMax(timeout, -1); QDeadlineTimer timer(timeout); QMutexLocker locker(&d->mutex); qint64 remainingTime = timer.remainingTime(); - while (n > d->avail && remainingTime > 0) { + while (n > d->avail && remainingTime != 0) { if (!d->cond.wait(locker.mutex(), remainingTime)) return false; remainingTime = timer.remainingTime(); |