Toggling an expired timer will reset to previous setting, then reset …

…to 0
nicluo · May 16, 2017 · 3ea3408 · 3ea3408
1 parent d6a54c3
commit 3ea3408
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/speedrunner/lib/timer.py b/speedrunner/lib/timer.py
@@ -24,15 +24,18 @@ def toggle(self):
         else:
             self.ti.start()
         self.running = not self.running
+        if self.expired():
+            self.reset()
         self.on_state_change(self.running)
 
     def reset(self):
         if self.running: # do not reset when running
             pass
+        elif self.expired():
+            self.ti = TimeInterval()
         else:
             self.ti = TimeInterval()
             self.setting = 0
-            self.on_state_change(self.running)
 
     def increment(self, seconds):
         self.setting += seconds

diff --git a/speedrunner/ui/subwindow.py b/speedrunner/ui/subwindow.py
@@ -69,10 +69,11 @@ def update_data(self):
 
     def update_border(self):
         if self.active_window:
-            if self.active_window.expired():
-                self.update_border_expired()
-            elif self.active_window.running():
-                self.frame.border('red')
+            if self.active_window.running():
+                if self.active_window.expired():
+                    self.update_border_expired()
+                else:
+                    self.frame.border('red')
         else:
             self.frame.border('black')