Changeset 14241 in josm for trunk/src

Timestamp:

2018-09-10T00:35:14+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16714 - NPE

File:

• trunk/src/org/openstreetmap/josm/actions/relation/DuplicateRelationAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/relation/DuplicateRelationAction.java

@@ -52 +52 @@
     }
 
+    private static boolean isEditableRelation(IRelation<?> r) {
+        return r instanceof Relation && r.getDataSet() != null && !r.getDataSet().isLocked();
+    }
+
     @Override
     protected void updateEnabledState() {
         // only one selected relation can be edited
         setEnabled(relations.size() == 1
-                && relations.iterator().next() instanceof Relation
-                && !relations.iterator().next().getDataSet().isLocked());
+                && isEditableRelation(relations.iterator().next()));
     }
 }