Skip to content

Commit 3b796cc

Browse files
committed
Updates based on review feedback
1 parent c8201fc commit 3b796cc

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

app/save-and-restore/app/doc/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,8 +340,8 @@ Restore from context menu
340340
^^^^^^^^^^^^^^^^^^^^^^^^^
341341

342342
User 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.
345345
However, PV items configured as read-only will always be excluded from a restore operation.
346346

347347
Restore result

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff 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();

0 commit comments

Comments
 (0)