Restore panel subset properly when loading state

hexrdgui/hexrd_config.py

@@ -770,8 +770,11 @@ def emit_update_status_bar(self, msg: str) -> None:
         self.update_status_bar.emit(msg)
 
     def on_detectors_changed(self) -> None:
-        # Reset azimuthal lineout detectors
-        self._azimuthal_lineout_detectors = None
+        # Reset azimuthal lineout detectors, unless we are loading state
+        # (the saved state already has the correct lineout detectors for the
+        # saved instrument).
+        if not self.loading_state:
+            self._azimuthal_lineout_detectors = None
 
     @property
     def indexing_config(self) -> dict[str, Any]:

hexrdgui/main_window.py

@@ -1528,7 +1528,11 @@ def on_action_save_state_triggered(self) -> None:
             return
 
         overwriting_last_loaded = False
-        if selected_file == HexrdConfig().last_loaded_state_file:
+        last_loaded = HexrdConfig().last_loaded_state_file
+        if (
+            last_loaded is not None
+            and Path(selected_file).resolve() == Path(last_loaded).resolve()
+        ):
             # We are over-writing the last loaded state file.
             # We must save to a temp file to avoid over-writing the
             # imageseries, which are already open...