Blame 0010-prevent-starting-a-QTimer-with-a-negative-interval.patch
|
Rex Dieter |
adf30af |
From de9bd9043e8878fc472ced1669bc7d49b07c2062 Mon Sep 17 00:00:00 2001
|
|
Rex Dieter |
adf30af |
From: =?UTF-8?q?Ren=C3=A9=20J=2EV=2E=20Bertin?= <rjvbertin@gmail.com>
|
|
Rex Dieter |
adf30af |
Date: Mon, 3 Nov 2014 16:56:56 +0100
|
|
Rex Dieter |
adf30af |
Subject: [PATCH 10/30] prevent starting a QTimer with a negative interval
|
|
Rex Dieter |
adf30af |
Review: 120800
|
|
Rex Dieter |
adf30af |
|
|
Rex Dieter |
adf30af |
---
|
|
Rex Dieter |
adf30af |
server/src/collectionscheduler.cpp | 3 ++-
|
|
Rex Dieter |
adf30af |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
Rex Dieter |
adf30af |
|
|
Rex Dieter |
adf30af |
diff --git a/server/src/collectionscheduler.cpp b/server/src/collectionscheduler.cpp
|
|
Rex Dieter |
adf30af |
index 8d4cd5c..9ba632f 100644
|
|
Rex Dieter |
adf30af |
--- a/server/src/collectionscheduler.cpp
|
|
Rex Dieter |
adf30af |
+++ b/server/src/collectionscheduler.cpp
|
|
Rex Dieter |
adf30af |
@@ -82,7 +82,8 @@ class PauseableTimer : public QTimer
|
|
Rex Dieter |
adf30af |
return;
|
|
Rex Dieter |
adf30af |
}
|
|
Rex Dieter |
adf30af |
|
|
Rex Dieter |
adf30af |
- start( interval() - ( mStarted.secsTo( mPaused ) * 1000 ) );
|
|
Rex Dieter |
adf30af |
+ const int remainder = interval() - ( mStarted.secsTo( mPaused ) * 1000 );
|
|
Rex Dieter |
adf30af |
+ start( qMax( 0, remainder ) );
|
|
Rex Dieter |
adf30af |
mPaused = QDateTime();
|
|
Rex Dieter |
adf30af |
// Update mStarted so that pause() can be called repeatedly
|
|
Rex Dieter |
adf30af |
mStarted = QDateTime::currentDateTime();
|
|
Rex Dieter |
adf30af |
--
|
|
Rex Dieter |
adf30af |
2.1.0
|
|
Rex Dieter |
adf30af |
|