From 58269b3bd071b186c1f6ae367e3326b671e8e4b7 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Wed, 25 Nov 2009 09:25:02 +0000 Subject: [PATCH] Fixes #3761: MenuBar breaks the application completely svn changeset:10005/svn branch:6.2 --- src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java index 0e09c7a287..1a3d372838 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java @@ -756,7 +756,8 @@ public class VMenuBar extends Widget implements Paintable, public void iLayout() { // Only collapse if there is more than one item in the root menu and the // menu has an explicit size - if ((getItems().size() > 1 || collapsedRootItems.getItems().size() > 0) + if ((getItems().size() > 1 || (collapsedRootItems != null && collapsedRootItems + .getItems().size() > 0)) && getElement().getStyle().getProperty("width") != null && moreItem != null) { -- 2.39.5