Changeset 13490 in josm for trunk/src/org

Timestamp:

2018-03-04T00:15:19+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #16045, see #8039, see #10456 - fix NPE when clicking preset link from relation editor

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -492 +492 @@
             }
 
+            boolean disableApply = false;
+            if (!sel.isEmpty()) {
+                DataSet ds = sel.iterator().next().getDataSet();
+                if (ds != null) {
+                    disableApply = ds.isLocked();
+                }
+            }
             answer = new PresetDialog(p, title, preset_name_label ? null : (ImageIcon) getValue(Action.SMALL_ICON),
-                    sel.isEmpty() || sel.iterator().next().getDataSet().isLocked(), showNewRelation).getValue();
+                    disableApply, showNewRelation).getValue();
         }
         if (!showNewRelation && answer == 2)