From 18126ecb99d60af93637b50af773346ca357135c Mon Sep 17 00:00:00 2001 From: John Alhroos Date: Wed, 10 Nov 2010 13:09:12 +0000 Subject: [PATCH] NPE fix. svn changeset:15954/svn branch:6.5 --- src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java | 2 +- 1 file changed, 1 insertion(+), 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 1ee7040295..277159b53c 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java @@ -427,7 +427,7 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, if (targetItem == null && client != null) { // Handle root menubar tooltips client.handleTooltipEvent(e, this); - } else { + } else if (targetItem != null) { // Handle item tooltips targetItem.onBrowserEvent(e); } -- 2.39.5