Changeset 16733 in josm for trunk

Timestamp:

2020-07-06T17:18:08+02:00 (4 years ago)

Author:

simon04

Message:

fix #19489 - NPE in ComboMultiSelect.getItemToSelect

File:

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

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java

@@ -352 +352 @@
             if (!usage.hadKeys() || PROP_FILL_DEFAULT.get() || isForceUseLastAsDefault()) {
                 // selected osm primitives are untagged or filling default feature is enabled
-                itemToSelect = getListEntry(def).getDisplayValue();
+                PresetListEntry entry = getListEntry(def);
+                itemToSelect = entry == null ? "" : entry.getDisplayValue();
             } else {
                 // selected osm primitives are tagged and filling default feature is disabled