File tree Expand file tree Collapse file tree 2 files changed +10
-4
lines changed
src/main/java/org/phoebus/applications/saveandrestore Expand file tree Collapse file tree 2 files changed +10
-4
lines changed Original file line number Diff line number Diff line change @@ -340,8 +340,8 @@ Restore from context menu
340340^^^^^^^^^^^^^^^^^^^^^^^^^
341341
342342User may invoke a restore operation (from client or from service) from context menu items in the tree
343- view or in the search-and-filer view. In this case user will not have the possibility to deselect specific PVs.
344- Filtering/exclusion based on PV name will also not be possible.
343+ view or in the search-and-filter view. In this case user will not have the possibility to deselect specific PVs.
344+ Filtering/exclusion based on PV name will not be possible either .
345345However, PV items configured as read-only will always be excluded from a restore operation.
346346
347347Restore result
Original file line number Diff line number Diff line change @@ -96,8 +96,14 @@ private boolean mayClose() {
9696 } else {
9797 CompletableFuture <Boolean > completableFuture = new CompletableFuture <>();
9898 Platform .runLater (() -> {
99- boolean okToClose = saveAndRestoreController .doCloseCheck ();
100- completableFuture .complete (okToClose );
99+ try {
100+ boolean okToClose = saveAndRestoreController .doCloseCheck ();
101+ completableFuture .complete (okToClose );
102+ } catch (Exception e ) {
103+ Logger .getLogger (SaveAndRestoreInstance .class .getName ()).log (Level .SEVERE ,
104+ "Got exception when checking if OK to close" , e );
105+ completableFuture .complete (true );
106+ }
101107 });
102108 try {
103109 return completableFuture .get ();
You can’t perform that action at this time.
0 commit comments