Changeset 6829 in josm for trunk

Timestamp:

2014-02-09T14:35:14+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #9701 - NPE in ToggleDialog

File:

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

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

@@ -88 +88 @@
         DYNAMIC
     }
-    
+
     /**
      * Property to enable dyanmic buttons globally.
@@ -762 +762 @@
         refreshHidingButtons();
     }
-    
+
     public int getPreferredHeight() {
         return preferredHeight;
@@ -893 +893 @@
     public void eventDispatched(AWTEvent event) {
         if(isShowing() && !isCollapsed && isDocked && buttonHiding == ButtonHidingType.DYNAMIC) {
-            Rectangle b = this.getBounds();
-            b.setLocation(getLocationOnScreen());
-            if (b.contains(((MouseEvent)event).getLocationOnScreen())) {
-                if(!buttonsPanel.isVisible()) {
-                    buttonsPanel.setVisible(true);
-                }
-            } else if (buttonsPanel.isVisible()) {
-                buttonsPanel.setVisible(false);
-            }
-        }
-    }
-    
+            if (buttonsPanel != null) {
+                Rectangle b = this.getBounds();
+                b.setLocation(getLocationOnScreen());
+                if (b.contains(((MouseEvent)event).getLocationOnScreen())) {
+                    if(!buttonsPanel.isVisible()) {
+                        buttonsPanel.setVisible(true);
+                    }
+                } else if (buttonsPanel.isVisible()) {
+                    buttonsPanel.setVisible(false);
+                }
+            }
+        }
+    }
+
     @Override
     public void preferenceChanged(PreferenceChangeEvent e) {
@@ -911 +913 @@
         }
     }
-    
+
     private void dynamicButtonsPropertyChanged() {
         boolean propEnabled = PROP_DYNAMIC_BUTTONS.get();