ui: remove interactive timeout callback when driver camera dialog closes

openpilot/selfdrive/ui/mici/onroad/driver_camera_dialog.py

@@ -232,9 +232,12 @@ def _draw_eyes(self, rect: rl.Rectangle, driver_data):
 class DriverCameraDialog(NavWidget, BaseDriverCameraDialog):
   def __init__(self):
     super().__init__()
-    # TODO: this can grow unbounded, should be given some thought
     device.add_interactive_timeout_callback(gui_app.pop_widget)
 
+  def hide_event(self):
+    super().hide_event()
+    device.remove_interactive_timeout_callback(gui_app.pop_widget)
+
 
 if __name__ == "__main__":
   gui_app.init_window("Driver Camera View (mici)")

openpilot/selfdrive/ui/onroad/driver_camera_dialog.py

@@ -13,12 +13,12 @@ class DriverCameraDialog(CameraView):
   def __init__(self):
     super().__init__("camerad", VisionStreamType.VISION_STREAM_DRIVER)
     self.driver_state_renderer = DriverStateRenderer()
-    # TODO: this can grow unbounded, should be given some thought
     device.add_interactive_timeout_callback(gui_app.pop_widget)
     ui_state.params.put_bool("IsDriverViewEnabled", True, block=True)
 
   def hide_event(self):
     super().hide_event()
+    device.remove_interactive_timeout_callback(gui_app.pop_widget)
     ui_state.params.put_bool("IsDriverViewEnabled", False, block=True)
     self.close()
 

openpilot/selfdrive/ui/ui_state.py

@@ -246,6 +246,9 @@ def _reset_interactive_timeout(self) -> None:
   def add_interactive_timeout_callback(self, callback: Callable):
     self._interactive_timeout_callbacks.append(callback)
 
+  def remove_interactive_timeout_callback(self, callback: Callable):
+    self._interactive_timeout_callbacks.remove(callback)
+
   def update(self):
     self._start_brightness_thread()  # start thread after manager forks ui