Changeset 13586 in josm for trunk/src/org

Timestamp:

2018-03-30T19:33:33+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #16141, see #8039, see #10456: fix NPE in preset editor

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java

@@ -12 +12 @@
 import javax.swing.JPanel;
 
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
@@ -40 +41 @@
                 return;
             int answer = t.showDialog(selection, false);
+            DataSet ds = selection.iterator().next().getDataSet();
+            boolean locked = ds != null && ds.isLocked();
 
-            if (answer == TaggingPreset.DIALOG_ANSWER_APPLY && !selection.iterator().next().getDataSet().isLocked()) {
+            if (answer == TaggingPreset.DIALOG_ANSWER_APPLY && !locked) {
                 presetHandler.updateTags(t.getChangedTags());
             }