diff --git a/selfdrive/ui/ui_state.py b/selfdrive/ui/ui_state.py index 0a37acc92..b312fafc2 100644 --- a/selfdrive/ui/ui_state.py +++ b/selfdrive/ui/ui_state.py @@ -257,7 +257,8 @@ class Device: ignition_just_turned_on = ui_state.ignition and not self._ignition self._ignition = ui_state.ignition - if ignition_just_turned_off or ignition_just_turned_on or any(ev.left_down for ev in gui_app.mouse_events): + enable_screen_event = ui_state.has_alert or ui_state.has_status_change + if ignition_just_turned_off or ignition_just_turned_on or enable_screen_event or any(ev.left_down for ev in gui_app.mouse_events): self.reset_interactive_timeout() interaction_timeout = time.monotonic() > self._interaction_time @@ -266,7 +267,6 @@ class Device: callback() self._prev_timed_out = interaction_timeout - enable_screen_event = ui_state.has_alert or ui_state.has_status_change wake_ignition = ui_state.ignition and not ui_state.onroad_screen_timeout wake_event_onroad = ui_state.ignition and ui_state.onroad_screen_timeout and enable_screen_event self._set_awake(wake_ignition or wake_event_onroad or not interaction_timeout)