diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/ui/VTree.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/ui/VTree.java b/client/src/com/vaadin/client/ui/VTree.java index 8fcb01e5d5..efbafd0cb7 100644 --- a/client/src/com/vaadin/client/ui/VTree.java +++ b/client/src/com/vaadin/client/ui/VTree.java @@ -710,7 +710,7 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, final int type = DOM.eventGetType(event); final Element target = DOM.eventGetTarget(event); - if (type == Event.ONLOAD && target == icon.getElement()) { + if (type == Event.ONLOAD && icon != null && target == icon.getElement()) { iconLoaded.trigger(); } |