Fix for #4373 - Menubar causes javascript exception in IE7

svn changeset:11977/svn branch:6.3

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
index e6bd4c62887619607eeb9bd3570b9bdf4abe71bc..5c359f70d42fb712867e97c411832a9d31b28fe1 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
@@ -545,6 +545,12 @@ public class VMenuBar extends Widget implements Paintable,
             popup.getElement().getStyle().setProperty("zoom", "");
             DeferredCommand.addCommand(new Command() {
                 public void execute() {
+                    if (popup == null) {
+                        // The child menu can be hidden before this command is
+                        // run.
+                        return;
+                    }
+
                     if (popup.getElement().getStyle().getProperty("width") == null
                             || popup.getElement().getStyle().getProperty(
                                     "width") == "") {