Merge pull request #3460 from ControlSystemStudio/CSSTUDIO-3314

Fix: Action to open save-and-restore throws NPE

Author: shroffk

app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/FilterViewInstance.java

@@ -18,7 +18,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.ResourceBundle;
-import java.util.concurrent.CompletableFuture;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -49,13 +48,12 @@ public FilterViewInstance(AppDescriptor appDescriptor) {
         }
 
         searchResultTableViewController = loader.getController();
-        dockItem.addCloseCheck(() -> {
+
+        dockItem.setOnCloseRequest(e -> {
+            searchResultTableViewController.handleTabClosed();
             INSTANCE = null;
-            return CompletableFuture.completedFuture(true);
         });
 
-        dockItem.setOnCloseRequest(e -> searchResultTableViewController.handleTabClosed());
-
         DockPane.getActiveDockPane().addTab(dockItem);
     }