Use _is_preview_live and clear trigger timeout

Replace direct checks of self._preview.state == PreviewState.ACTIVE with self._is_preview_live() in camera_config_dialog to centralize preview-active logic and ensure consistent behavior when restarting the preview after trigger or camera setting changes. In trigger_config_dialog, only set payload["timeout"] for external/follower roles when timeout > 0, and explicitly set payload["timeout"] = None when role == "off" to clear any stale timeout when disabling the trigger.

Author: C-Achard

dlclivegui/gui/camera_config/camera_config_dialog.py

@@ -1090,7 +1090,7 @@ def _open_trigger_settings_dialog(self) -> None:
         self._load_camera_to_form(updated)
 
         # Trigger changes require reopening the camera preview/backend.
-        if self._preview.state == PreviewState.ACTIVE:
+        if self._is_preview_live():
             self._append_status("[Trigger] Restarting preview to apply trigger settings.")
             self._request_preview_restart(updated, reason="trigger-settings")
 
@@ -1153,9 +1153,7 @@ def _apply_camera_settings(self) -> bool:
                 old_settings = current_model
 
             restart = False
-            should_consider_restart = self._preview.state == PreviewState.ACTIVE and isinstance(
-                old_settings, CameraSettings
-            )
+            should_consider_restart = self._is_preview_live() and isinstance(old_settings, CameraSettings)
             if should_consider_restart:
                 restart = self._should_restart_preview(old_settings, new_model)
 
@@ -1167,7 +1165,7 @@ def _apply_camera_settings(self) -> bool:
                 new_model.index,
             )
 
-            if self._preview.state == PreviewState.ACTIVE and restart:
+            if self._is_preview_live() and restart:
                 self._append_status("[Apply] Restarting preview to apply camera settings changes.")
                 self._request_preview_restart(new_model, reason="apply-settings")
 

dlclivegui/gui/camera_config/trigger_config_dialog.py

@@ -164,8 +164,10 @@ def _accept(self) -> None:
         }
 
         timeout = float(self.timeout_spin.value())
-        if timeout > 0:
+        if role in {"external", "follower"} and timeout > 0:
             payload["timeout"] = timeout
+        elif role == "off":
+            payload["timeout"] = None  # ensure timeout is cleared when disabling trigger
 
         trigger = CameraTriggerSettings.from_any(payload)