Sync git svn branch with SVN repository r33219.

refs #5039

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 71e9dd113a17d7bbcfb43b738a42a37c4d9704d7..1debee624e803ae51d95622c6c983c041fc16872 100644 (file)
--- 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;\r
         GENodeQueryManager manager = new GENodeQueryManager(explorerContext, null, null, TreeItemReference.create(treeItem.getParentItem()));\r
         nodeContext = (NodeContext) treeItem.getData();\r
             return false;\r
         GENodeQueryManager manager = new GENodeQueryManager(explorerContext, null, null, TreeItemReference.create(treeItem.getParentItem()));\r
         nodeContext = (NodeContext) treeItem.getData();\r

-        labeler = manager.query(nodeContext, BuiltinKeys.SELECTED_LABELER);\r
+        if (nodeContext != null)\r
+            labeler = manager.query(nodeContext, BuiltinKeys.SELECTED_LABELER);\r

         if (nodeContext == null || !(labeler instanceof LabelerStub))\r
             return false;\r
         return ((LabelerStub) labeler).shouldCreateToolTip(event, nodeContext);\r
         if (nodeContext == null || !(labeler instanceof LabelerStub))\r
             return false;\r
         return ((LabelerStub) labeler).shouldCreateToolTip(event, nodeContext);\r