Changeset 2708 in josm for trunk/src/org

Timestamp:

2009-12-30T00:59:21+01:00 (14 years ago)

Author:

stoecker

Message:

close #4260 - NPE

File:

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

trunk/src/org/openstreetmap/josm/Main.java

@@ -308 +308 @@
 
         try {
+            String defaultlaf = platform.getDefaultStyle();
             try {
-                String laf = Main.pref.get("laf", platform.getDefaultStyle());
+                String laf = Main.pref.get("laf", defaultlaf);
                 if(laf != null && laf.length() > 0) {
                     UIManager.setLookAndFeel(laf);
                 }
             }
+            catch (final java.lang.ClassNotFoundException e) {
+                System.out.println("Look and Feel not found: " + Main.pref.get("laf"));
+                Main.pref.put("laf", defaultlaf);
+            }
             catch (final javax.swing.UnsupportedLookAndFeelException e) {
                 System.out.println("Look and Feel not supported: " + Main.pref.get("laf"));
+                Main.pref.put("laf", defaultlaf);
             }
             toolbar = new ToolbarPreferences();