Changeset 3194 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2010-04-19T20:58:23+02:00 (14 years ago)

Author:

jttt

Message:

Fix #4875 Display settings->Colors->Set all to default segfaults

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (3 diffs)

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

@@ -608 +608 @@
     synchronized public Color getDefaultColor(String colName) {
         String colStr = defaults.get("color."+colName);
-        return colStr.equals("") ? null : ColorHelper.html2color(colStr);
+        return colStr == null || "".equals(colStr) ? null : ColorHelper.html2color(colStr);
     }
 
@@ -756 +756 @@
     /**
      * Replies the collection of plugin site URLs from where plugin lists can be downloaded
-     * 
+     *
      * @return
      */
@@ -765 +765 @@
     /**
      * Sets the collection of plugin site URLs.
-     * 
+     *
      * @param sites the site URLs
      */