Normalize camera ID and improve scan cleanup

Normalize dlc_camera_id values (split on ':' and lowercase backend part, fallback to lowercasing whole string) and refresh camera labels accordingly. Improve camera discovery shutdown: set scan state to CANCELING when stopping, avoid immediate cleanup if the scan thread is still running, and route worker finished to a new handler (_on_scan_thread_finished) that performs cleanup and sets state to IDLE. Also stop calling _populate_from_settings() when opening the camera dialog to avoid overwriting unsaved changes; let the dialog refresh itself when shown.

Author: C-Achard

dlclivegui/gui/camera_config/camera_config_dialog.py

@@ -88,8 +88,15 @@ def dlc_camera_id(self) -> str | None:
 
     @dlc_camera_id.setter
     def dlc_camera_id(self, value: str | None) -> None:
-        """Set the currently selected DLC camera ID."""
-        self._dlc_camera_id = value
+        if not value:
+            self._dlc_camera_id = None
+        else:
+            try:
+                b, idx = value.split(":", 1)
+                self._dlc_camera_id = f"{b.lower()}:{idx}"
+            except ValueError:
+                # fallback: lowercase entire string
+                self._dlc_camera_id = value.lower()
         self._refresh_camera_labels()
 
     def showEvent(self, event):
@@ -197,8 +204,10 @@ def _on_close_cleanup(self) -> None:
             except Exception:
                 pass
             # Keep this short to reduce UI freeze
+            self._set_scan_state(CameraScanState.CANCELING, message="Canceling discovery…")
             sw.wait(300)
-        self._set_scan_state(CameraScanState.IDLE)
+            if sw.isRunning():
+                return  # Let finished() handle cleanup
         if self._scan_worker and not self._scan_worker.isRunning():
             self._cleanup_scan_worker()
 
@@ -592,7 +601,7 @@ def _refresh_available_cameras(self) -> None:
         w.canceled.connect(self._on_scan_canceled)
 
         # Cleanup only
-        w.finished.connect(self._cleanup_scan_worker)
+        w.finished.connect(self._on_scan_thread_finished)
 
         self.scan_started.emit(f"Scanning {backend} cameras…")
         w.start()
@@ -605,6 +614,10 @@ def _on_scan_progress(self, msg: str) -> None:
             return
         self._show_scan_overlay(msg or "Discovering cameras…")
 
+    def _on_scan_thread_finished(self):
+        self._cleanup_scan_worker()
+        self._set_scan_state(CameraScanState.IDLE)
+
     def _on_scan_result(self, cams: list) -> None:
         if self.sender() is not self._scan_worker:
             LOGGER.debug("[Scan] Ignoring result from old worker: %d cameras", len(cams) if cams else 0)

dlclivegui/gui/main_window.py

@@ -1193,7 +1193,8 @@ def _open_camera_config_dialog(self) -> None:
             self._cam_dialog.settings_changed.connect(self._on_multi_camera_settings_changed)
         else:
             # Refresh its UI from current settings when reopened
-            self._cam_dialog._populate_from_settings()
+            # self._cam_dialog._populate_from_settings()
+            # ^ do not call here -let the dialog handle it via showEvent to avoid overwriting unsaved changes
             self._cam_dialog.dlc_camera_id = self._inference_camera_id
 
         self._cam_dialog.show()