Changeset 2185 in josm for trunk/src/org/openstreetmap/josm/Main.java

Timestamp:

2009-09-23T11:14:18+02:00 (17 years ago)

Author:

stoecker

Message:

see #3550 - fixed resizable side views - patch by bastiK

File:

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

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

@@ -526 +526 @@
         // save the current window geometry and the width of the toggle dialog area
         String newGeometry = "";
-        String newToggleDlgWidth = "";
+        String newToggleDlgWidth = null;
         try {
             if (((JFrame)parent).getExtendedState() == JFrame.NORMAL) {
@@ -549 +549 @@
                 newGeometry = width + "x" + height + "+" + x + "+" + y;
             }
-
-            newToggleDlgWidth = Integer.toString(map.getToggleDlgWidth());
-            if (newToggleDlgWidth.equals(Integer.toString(map.DEF_TOGGLE_DLG_WIDTH))) {
-                newToggleDlgWidth = "";
+            
+            if (map  != null) {
+                newToggleDlgWidth = Integer.toString(map.getToggleDlgWidth());
+                if (newToggleDlgWidth.equals(Integer.toString(map.DEF_TOGGLE_DLG_WIDTH))) {
+                    newToggleDlgWidth = "";
+                }
             }
         }
         catch (Exception e) {
             System.out.println("Failed to save GUI geometry: " + e);
+            e.printStackTrace();
         }
         pref.put("gui.geometry", newGeometry);
-        pref.put("toggleDialogs.width", newToggleDlgWidth);
+        if (newToggleDlgWidth != null) {
+            pref.put("toggleDialogs.width", newToggleDlgWidth);
+        }
     }
 }