Merge: bulletproof close + light theme demo

Author: HanSur94

demo/industrial_plant/private/buildCompanion.m

@@ -11,9 +11,10 @@
 %     - TagRegistry singleton has been populated by registerPlantTags so
 %       the companion's catalog reflects every plant tag.
 %
-%   Theme is hardcoded to 'dark' -- matching the existing dashboard's
-%   visual register and avoiding a parameterization ahead of need. If the
-%   demo gains a theme option in a later phase, lift this through ctx.
+%   Theme is hardcoded to 'light' -- matching buildDashboard.m which also
+%   renders the demo dashboard in 'light' theme. Keeping the two windows
+%   visually consistent. If the demo gains a theme option in a later
+%   phase, lift this through ctx.
 %
 %   Returns:
 %     companion - live FastSenseCompanion handle (uifigure already visible).
@@ -22,5 +23,5 @@
 
     companion = FastSenseCompanion( ...
         'Dashboards', {ctx.engine}, ...
-        'Theme',      'dark');
+        'Theme',      'light');
 end

libs/FastSenseCompanion/FastSenseCompanion.m

@@ -186,31 +186,60 @@
         function close(obj)
         %CLOSE Idempotent teardown — deletes listeners, owned timers, and the uifigure.
         %   Does NOT affect any DashboardEngine figure or ad-hoc plot figures.
+        %
+        %   Bulletproof: every cleanup step is wrapped in try/catch so a
+        %   single failure (e.g. a stale listener handle, a pane already
+        %   half-deleted) cannot prevent the uifigure itself from being
+        %   deleted. The X-button must always close the window.
             if ~isvalid(obj)
                 return;
             end
             if isempty(obj.hFig_) || ~isvalid(obj.hFig_)
+                obj.hFig_  = [];
+                obj.IsOpen = false;
                 return;
             end
-            % Detach panes (releases their listeners)
-            if ~isempty(obj.CatalogPane_) && isvalid(obj.CatalogPane_)
-                obj.CatalogPane_.detach();
+            % Diagnostic — confirms the X click reached close().
+            fprintf('[FastSenseCompanion] close() invoked, tearing down...\n');
+            % Detach panes (releases their listeners + debounce timers).
+            try
+                if ~isempty(obj.CatalogPane_) && isvalid(obj.CatalogPane_)
+                    obj.CatalogPane_.detach();
+                end
+            catch err
+                fprintf(2, '[FastSenseCompanion] CatalogPane.detach failed: %s\n', err.message);
             end
-            if ~isempty(obj.ListPane_) && isvalid(obj.ListPane_)
-                obj.ListPane_.detach();
+            try
+                if ~isempty(obj.ListPane_) && isvalid(obj.ListPane_)
+                    obj.ListPane_.detach();
+                end
+            catch err
+                fprintf(2, '[FastSenseCompanion] ListPane.detach failed: %s\n', err.message);
+            end
+            try
+                if ~isempty(obj.InspectorPane_) && isvalid(obj.InspectorPane_)
+                    obj.InspectorPane_.detach();
+                end
+            catch err
+                fprintf(2, '[FastSenseCompanion] InspectorPane.detach failed: %s\n', err.message);
             end
-            if ~isempty(obj.InspectorPane_) && isvalid(obj.InspectorPane_)
-                obj.InspectorPane_.detach();
+            % Release orchestrator-level listeners.
+            try
+                delete(obj.Listeners_);
+            catch err
+                fprintf(2, '[FastSenseCompanion] Listeners delete failed: %s\n', err.message);
             end
-            % Release orchestrator-level listeners
-            delete(obj.Listeners_);
             obj.Listeners_ = {};
-            % No companion-owned timers in Phase 1018 — pattern established for Phases 1019+:
-            %   stop(t); delete(t);  (always in this order)
-            % Close the uifigure
-            delete(obj.hFig_);
+            % Always delete the uifigure last and unconditionally — this is
+            % what makes the X click actually close the window.
+            try
+                delete(obj.hFig_);
+            catch err
+                fprintf(2, '[FastSenseCompanion] hFig delete failed: %s\n', err.message);
+            end
             obj.hFig_  = [];
             obj.IsOpen = false;
+            fprintf('[FastSenseCompanion] close() complete.\n');
         end
 
         function delete(obj)