Fixed combo box list to open properly when starting edit

[simantics/platform.git] / bundles / org.simantics.browsing.ui.swt / src / org / simantics / browsing / ui / swt / GraphExplorerImpl.java

diff --git a/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/GraphExplorerImpl.java b/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/GraphExplorerImpl.java
index df736c1e6dc2603315bea23f47b46a2170a52f55..6361401b48723f58aa62516387421f5f473ea8cc 100644 (file)
--- a/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/GraphExplorerImpl.java
+++ b/bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/GraphExplorerImpl.java
@@ -1076,7 +1076,6 @@ class GraphExplorerImpl extends GraphExplorerImplBase implements Listener, Graph
         editor.setEditor(combo, item, columnIndex);
 
         combo.setFocus();
-        combo.setListVisible(true);
 
         GraphExplorerImpl.this.reconfigureTreeEditorForText(item, columnIndex, combo, combo.getText(), SWT.DEFAULT, 0, 0);
 
@@ -1085,6 +1084,7 @@ class GraphExplorerImpl extends GraphExplorerImplBase implements Listener, Graph
         // Removed in comboListener
         currentlyModifiedNodes.add(context);
 
+        combo.setListVisible(true);
         //System.out.println("START ENUMERATION EDITING: " + item);
     }
 
@@ -3119,7 +3119,10 @@ class GraphExplorerImpl extends GraphExplorerImplBase implements Listener, Graph
        //System.out.println("NodeContext path : " + contexts);
 
        NodeContext head = tryFind(contexts[position]);
-
+       // tryFind may return null for positions, that actually have NodeContext. 
+       if (head == null)
+           return false;
+       
        if(position == contexts.length-1) {
                return select(head);