diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java index cab37e7c70..4d43b7c346 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java @@ -288,7 +288,7 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, currentItem.setSubMenu(currentMenu); } - if (!itr.hasNext()) { + while (!itr.hasNext() && !iteratorStack.empty()) { boolean hasCheckableItem = false; for (CustomMenuItem menuItem : currentMenu.getItems()) { hasCheckableItem = hasCheckableItem @@ -299,9 +299,7 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, } else { currentMenu.removeStyleDependentName("check-column"); } - } - while (!itr.hasNext() && !iteratorStack.empty()) { itr = iteratorStack.pop(); currentMenu = menuStack.pop(); } |