Changeset 3194 in josm for trunk/src


Ignore:
Timestamp:
2010-04-19T20:58:23+02:00 (10 years ago)
Author:
jttt
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/Preferences.java

    r2845 r3194  
    608608    synchronized public Color getDefaultColor(String colName) {
    609609        String colStr = defaults.get("color."+colName);
    610         return colStr.equals("") ? null : ColorHelper.html2color(colStr);
     610        return colStr == null || "".equals(colStr) ? null : ColorHelper.html2color(colStr);
    611611    }
    612612
     
    756756    /**
    757757     * Replies the collection of plugin site URLs from where plugin lists can be downloaded
    758      * 
     758     *
    759759     * @return
    760760     */
     
    765765    /**
    766766     * Sets the collection of plugin site URLs.
    767      * 
     767     *
    768768     * @param sites the site URLs
    769769     */
Note: See TracChangeset for help on using the changeset viewer.