- Fix fadeout timeouts not being cleanly canceled

trigg · Mar 24, 2024 · 2ae0b82 · 2ae0b82
1 parent c07b87e
commit 2ae0b82
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/discover_overlay/voice_overlay.py b/discover_overlay/voice_overlay.py
@@ -133,15 +133,18 @@ def reset_action_timer(self):
         self.fade_opacity = 1.0
         if self.inactive_timeout:
             GLib.source_remove(self.inactive_timeout)
+            self.inactive_timeout = None
         if self.fadeout_timeout:
-            GLib.source_remove(self.fade_opacity)
+            GLib.source_remove(self.fadeout_timeout)
+            self.fadeout_timeout = None
 
         if self.fade_out_inactive:
-            GLib.timeout_add_seconds(self.inactive_time, self.overlay_inactive)
+            self.inactive_timeout = GLib.timeout_add_seconds(self.inactive_time, self.overlay_inactive)
 
     def overlay_inactive(self):
         self.fade_start= perf_counter()
-        GLib.timeout_add(self.inactive_fade_time/200 * 1000, self.overlay_fadeout)
+        self.fadeout_timeout = GLib.timeout_add(self.inactive_fade_time/200 * 1000, self.overlay_fadeout)
+        self.inactive_timeout = None
         return False
 
     def overlay_fadeout(self):
@@ -150,6 +153,7 @@ def overlay_fadeout(self):
         time_percent = (now - self.fade_start) / self.inactive_fade_time
         if time_percent>=1.0:
             self.fade_opacity = self.fade_out_limit
+            self.fadeout_timeout = None
             return False
 
         self.fade_opacity = self.fade_out_limit + ((1.0 - self.fade_out_limit) * (1.0 - time_percent))