Changeset 5973 in josm for trunk/src/org

Timestamp:

2013-05-29T00:48:31+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8740 - fix NPE in core with plugins defining invalid preferences (scripting)

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

@@ -201 +201 @@
             @Override
             public boolean identify(TabPreferenceSetting tps, Object name) {
-                return tps != null && tps.getIconName().equals(name);
+                return name != null && tps != null && tps.getIconName() != null && tps.getIconName().equals(name);
             }}, name);
     }