]>
Commit | Line | Data |
---|---|---|
8a8f9fb3 AM |
1 | From de9bd9043e8878fc472ced1669bc7d49b07c2062 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Ren=C3=A9=20J=2EV=2E=20Bertin?= <rjvbertin@gmail.com> | |
3 | Date: Mon, 3 Nov 2014 16:56:56 +0100 | |
4 | Subject: [PATCH 10/30] prevent starting a QTimer with a negative interval | |
5 | Review: 120800 | |
6 | ||
7 | --- | |
8 | server/src/collectionscheduler.cpp | 3 ++- | |
9 | 1 file changed, 2 insertions(+), 1 deletion(-) | |
10 | ||
11 | diff --git a/server/src/collectionscheduler.cpp b/server/src/collectionscheduler.cpp | |
12 | index 8d4cd5c..9ba632f 100644 | |
13 | --- a/server/src/collectionscheduler.cpp | |
14 | +++ b/server/src/collectionscheduler.cpp | |
15 | @@ -82,7 +82,8 @@ class PauseableTimer : public QTimer | |
16 | return; | |
17 | } | |
18 | ||
19 | - start( interval() - ( mStarted.secsTo( mPaused ) * 1000 ) ); | |
20 | + const int remainder = interval() - ( mStarted.secsTo( mPaused ) * 1000 ); | |
21 | + start( qMax( 0, remainder ) ); | |
22 | mPaused = QDateTime(); | |
23 | // Update mStarted so that pause() can be called repeatedly | |
24 | mStarted = QDateTime::currentDateTime(); | |
25 | -- | |
26 | 2.1.0 | |
27 |