Fix for #4373 - Menubar causes javascript exception in IE7

svn changeset:11976/svn branch:6.2

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
index 0b110889cf002afb4e7585dc0b98cc194952974f..40a3d74e36d70bbbda1a9b523a6aa246f45f1a76 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
@@ -27,7 +27,7 @@ import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.Util;
 
 public class VMenuBar extends Widget implements Paintable,
-CloseHandler<PopupPanel>, ContainerResizedListener {
+        CloseHandler<PopupPanel>, ContainerResizedListener {
 
     /** Set the CSS class name to allow styling. */
     public static final String CLASSNAME = "v-menubar";
@@ -542,6 +542,12 @@ CloseHandler<PopupPanel>, ContainerResizedListener {
             popup.getElement().getStyle().setProperty("zoom", "");
             DeferredCommand.addCommand(new Command() {
                 public void execute() {
+                    if (popup == null) {
+                        // The child menu can be hidden before this command has
+                        // time to run.
+                        return;
+                    }
+
                     if (popup.getElement().getStyle().getProperty("width") == null
                             || popup.getElement().getStyle().getProperty(
                                     "width") == "") {