Changeset 15029 in josm for trunk/src

Timestamp:

2019-04-28T03:45:09+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #17645 - robustness to invalid preset icons

File:

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

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

@@ -226 +226 @@
             .getResourceAsync(result -> {
                 if (result != null) {
-                    GuiHelper.runInEDT(() -> result.attachImageIcon(this));
+                    GuiHelper.runInEDT(() -> {
+                        try {
+                            result.attachImageIcon(this);
+                        } catch (IllegalArgumentException e) {
+                            Logging.warn(toString() + ": " + PRESET_ICON_ERROR_MSG_PREFIX + iconName);
+                            Logging.warn(e);
+                        }
+                    });
                 } else {
                     Logging.warn(toString() + ": " + PRESET_ICON_ERROR_MSG_PREFIX + iconName);