Merge commit '9d2bb8d'

refs #6684

diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/TextNode.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/TextNode.java
index f948bc053c901b7a1e92201e5c4904fb61be6f6a..ed8df095a72b587f297002fcc3ecca9d80852e04 100644 (file)
--- a/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/TextNode.java
+++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/TextNode.java
@@ -327,7 +327,7 @@ public class TextNode extends G2DNode implements IDynamicSelectionPainterNode, L
             return null;\r
         if (hasState(STATE_EDITING) == edit)\r
             return null;\r
-        setState(STATE_EDITING);\r
+        setState(STATE_EDITING, edit);\r
         if (edit) {\r
             caret = text != null ? text.length() : 0;\r
             selectionTail = 0;\r