Changeset 6312 in josm

Timestamp:

2013-10-07T11:06:57+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #9161 - "java.lang.IllegalStateException" errors when accessing preferences with a blank profile

File:

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

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

@@ -740 +740 @@
         try {
             Matcher m = Pattern.compile("mappaint\\.(.+?)\\.(.+)").matcher(o);
-            m.matches();
-            return tr("Paint style {0}: {1}", tr(m.group(1)), tr(m.group(2)));
+            if (m.matches()) {
+                return tr("Paint style {0}: {1}", tr(m.group(1)), tr(m.group(2)));
+            }
         } catch (Exception e) {
             Main.warn(e);
@@ -747 +748 @@
         try {
             Matcher m = Pattern.compile("layer (.+)").matcher(o);
-            m.matches();
-            return tr("Layer: {0}", tr(m.group(1)));
+            if (m.matches()) {
+                return tr("Layer: {0}", tr(m.group(1)));
+            }
         } catch (Exception e) {
             Main.warn(e);