Changeset 2316 in josm for trunk

Timestamp:

2009-10-25T14:14:56+01:00 (15 years ago)

Author:

stoecker

Message:

fix #3768 - NPE on start

File:

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

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

@@ -496 +496 @@
             else {
                 Action a = getAction(s);
-                JButton b = control.add(a);
-                String tt = (String) a.getValue(TaggingPreset.OPTIONAL_TOOLTIP_TEXT);
-                if (tt != null) {
-                    b.setToolTipText(tt);
+                if(a != null)
+                {
+                    JButton b = control.add(a);
+                    Object tt = a.getValue(TaggingPreset.OPTIONAL_TOOLTIP_TEXT);
+                    if (tt != null)
+                        b.setToolTipText((String)tt);
                 }
             }