Changeset 6626 in josm for trunk/src/org

Timestamp:

2014-01-04T16:36:20+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #9530 - NPE in color preferences

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -878 +878 @@
             colStr = get("color." + colKey, ColorHelper.color2html(def));
         }
-        return colStr.isEmpty() ? def : ColorHelper.html2color(colStr);
+        if (colStr != null && !colStr.isEmpty()) {
+            return ColorHelper.html2color(colStr);
+        } else {
+            return def;
+        }
     }