Panel WorldClock plugin: restart timer only if update interval is long

Razor-qt · Nov 28, 2012 · 5c234d1 · 5c234d1
1 parent 4f768c7
commit 5c234d1
Showing 1 changed file with 3 additions and 12 deletions.
diff --git a/razorqt-panel/plugin-worldclock/razorworldclock.cpp b/razorqt-panel/plugin-worldclock/razorworldclock.cpp
@@ -123,7 +123,7 @@ void RazorWorldClock::timeout(void)
 
         UDate now = Calendar::getNow();
 
-        if ((static_cast<long long>(now) % 1000) > 200)
+        if ((mTimer->interval() >= 1000) && ((static_cast<long long>(now) % 1000) > 200))
             restartTimer(mTimer->interval());
 
         mFormat->format(now, str, status);
@@ -203,23 +203,14 @@ void RazorWorldClock::restartTimer(int timerInterval)
     mTimer->stop();
     mTimer->setInterval(timerInterval);
 
-    switch (timerInterval)
+    if (timerInterval < 1000)
-    {
-    case 1:
-    case 10:
-    case 100:
         mTimer->start();
-        break;
+    else
-
-    case 1000:
-    case 60000:
     {
         int delay = static_cast<int>((timerInterval + 100 - (static_cast<long long>(Calendar::getNow()) % timerInterval)) % timerInterval);
         QTimer::singleShot(delay, this, SLOT(timeout()));
         QTimer::singleShot(delay, mTimer, SLOT(start()));
     }
-        break;
-    }
 }
 
 void RazorWorldClock::updateTimezone(void)