Merge pull request #2989 from ControlSystemStudio/CSSTUDIO-2306

Add null check when restoring snapshot containing disconnected items
ControlSystemStudio · Mar 25, 2024 · c9fef61 · c9fef61
2 parents c5f403f + 94a8088
commit c9fef61
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...java/org/phoebus/applications/saveandrestore/ui/snapshot/SnapshotTableViewController.java b/...java/org/phoebus/applications/saveandrestore/ui/snapshot/SnapshotTableViewController.java
@@ -353,7 +353,9 @@ public void restore(Snapshot snapshot, Consumer<List<String>> completion) {
             for (SnapshotItem entry : snapshot.getSnapshotData().getSnapshotItems()) {
                 TableEntry e = tableEntryItems.get(getPVKey(entry.getConfigPv().getPvName(), entry.getConfigPv().isReadOnly()));
 
-                boolean restorable = e.selectedProperty().get() && !e.readOnlyProperty().get() &&
+                boolean restorable = e.selectedProperty().get() &&
+                        !e.readOnlyProperty().get() &&
+                        entry.getValue() != null &&
                         !entry.getValue().equals(VNoData.INSTANCE);
 
                 if (restorable) {