From 17c5a3630dae59497504503912800a01cc7652a4 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Thu, 31 Mar 2011 11:06:43 +0000 Subject: #6590 Do not try to remove collapsed items when there are no collapsed items svn changeset:18054/svn branch:6.5 --- src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java index 2b996d5792..56b7d198e0 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java @@ -985,7 +985,8 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, int widthAvailable = diff + moreItemWidth; int widthGrowth = 0; - while (widthAvailable > widthGrowth) { + while (widthAvailable > widthGrowth + && collapsedRootItems.getItems().size() > 0) { // Move first item from collapsed menu to the root menu CustomMenuItem expand = collapsedRootItems.getItems() .get(0); -- cgit v1.2.3