From ef157f6afabcaaed2dfe881d7d63d3c52ec44be5 Mon Sep 17 00:00:00 2001 From: Cameron Clough Date: Wed, 16 Apr 2025 19:41:49 +0100 Subject: [PATCH] renderer can be None, sometimes we don't want to init - e.g. CI --- system/ui/lib/wrapper.py | 6 +++--- system/ui/spinner.py | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/system/ui/lib/wrapper.py b/system/ui/lib/wrapper.py index d82d2b6c95..2c867d7b3a 100644 --- a/system/ui/lib/wrapper.py +++ b/system/ui/lib/wrapper.py @@ -4,7 +4,7 @@ from typing import Any from openpilot.system.ui.lib.application import gui_app class Wrapper: - _renderer: Any = None + _renderer: Any | None = None def __init__(self, title: str, renderer_cls, *renderer_args): self._title = title @@ -20,12 +20,12 @@ class Wrapper: def _run(self): gui_app.init_window(self._title) - self._renderer = self._renderer_cls(*self._renderer_args) + self._renderer = renderer = self._renderer_cls(*self._renderer_args) try: for _ in gui_app.render(): if self._stop_event.is_set(): break - self._renderer.render() + renderer.render() finally: gui_app.close() diff --git a/system/ui/spinner.py b/system/ui/spinner.py index 44afbf5857..a8a69eed63 100755 --- a/system/ui/spinner.py +++ b/system/ui/spinner.py @@ -73,7 +73,8 @@ class Spinner(Wrapper): super().__init__("Spinner", Renderer) def update(self, spinner_text: str): - self._renderer.set_text(spinner_text) + if self._renderer is not None: + self._renderer.set_text(spinner_text) def update_progress(self, cur: float, total: float): self.update(str(round(100 * cur / total)))