X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FTimer.cc;fp=src%2FTimer.cc;h=8cd4714eb00b14bfaeec07ebd06e1d0fe2a673b1;hb=ae093dba2fb97124bb4af3eaf4070b46f07dfd74;hp=917bc3375a7e22d368d039eed79a0780c670cd9a;hpb=a4c9553c64fb854aa5fdf79f87d5b4d6a07ca67e;p=chaz%2Fopenbox

diff --git a/src/Timer.cc b/src/Timer.cc
index 917bc337..8cd4714e 100644
--- a/src/Timer.cc
+++ b/src/Timer.cc
@@ -46,6 +46,10 @@ void BTimer::setTimeout(long t) {
   _timeout.tv_usec = t;
   _timeout.tv_usec -= (_timeout.tv_sec * 1000);
   _timeout.tv_usec *= 1000;
+  if (timing) {
+    display.removeTimer(this);
+    display.addTimer(this);     // reorder the display
+  }
 }
 
 void BTimer::setTimeout(timeval t) {
@@ -63,9 +67,11 @@ void BTimer::start(void) {
 }
 
 void BTimer::stop(void) {
-  timing = False;
+  if (timing) {
+    timing = False;
 
-  display.removeTimer(this);
+    display.removeTimer(this);
+  }
 }
 
 void BTimer::fireTimeout(void) {