Changeset 6061 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2013-07-10T20:56:22+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8865 - fix NPE in core

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

@@ -96 +96 @@
 
     /** The action to toggle this dialog */
-    protected ToggleDialogAction toggleAction;
+    protected final ToggleDialogAction toggleAction;
     protected String preferencePrefix;
     final protected String name;
@@ -242 +242 @@
             if (isShowing) {
                 hideDialog();
-                dialogsPanel.reconstruct(Action.ELEMENT_SHRINKS, null);
+                if (dialogsPanel != null) {
+                    dialogsPanel.reconstruct(Action.ELEMENT_SHRINKS, null);
+                }
                 hideNotify();
             } else {
@@ -249 +251 @@
                     expand();
                 }
-                if (isDocked) {
+                if (isDocked && dialogsPanel != null) {
                     dialogsPanel.reconstruct(Action.INVISIBLE_TO_DEFAULT, ToggleDialog.this);
                 }