From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Tue, 20 Sep 2016 08:01:16 +0000 (+0300)
Subject: Merge commit '12468c2'
X-Git-Tag: v1.25.0~105
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=463c2a8dd4b9ca623872e6520906c19c03a1c4cb;hp=1072d7dea84ab8007d7912cc7533c4d6e6a51948

Merge commit '12468c2'
---

diff --git a/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/GraphExplorerToolTip.java b/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/GraphExplorerToolTip.java
index 71e9dd113..1debee624 100644
--- a/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/GraphExplorerToolTip.java
+++ b/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/GraphExplorerToolTip.java
@@ -46,7 +46,8 @@ public class GraphExplorerToolTip extends ToolTip {
             return false;
         GENodeQueryManager manager = new GENodeQueryManager(explorerContext, null, null, TreeItemReference.create(treeItem.getParentItem()));
         nodeContext = (NodeContext) treeItem.getData();
-        labeler = manager.query(nodeContext, BuiltinKeys.SELECTED_LABELER);
+        if (nodeContext != null)
+            labeler = manager.query(nodeContext, BuiltinKeys.SELECTED_LABELER);
         if (nodeContext == null || !(labeler instanceof LabelerStub))
             return false;
         return ((LabelerStub) labeler).shouldCreateToolTip(event, nodeContext);