X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.diagram%2Fsrc%2Forg%2Fsimantics%2Fdiagram%2Felements%2FEditorStateManager.java;h=5c59177cccf4f1c3a8088ff08690adf79c5c7ac7;hb=refs%2Fchanges%2F11%2F1011%2F4;hp=8ddb16ac76d53eec771f7c165a64f3b6a00fc7e9;hpb=5aa280d62ca00cdb18f908045cd1a5fb5a6525fb;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/EditorStateManager.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/EditorStateManager.java
index 8ddb16ac7..5c59177cc 100644
--- a/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/EditorStateManager.java
+++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/EditorStateManager.java
@@ -67,6 +67,9 @@ class EditorStateManager {
 		String currentText = span.getText();
 
 		SingleElementNode sne = node.getSingleElementNode();
+		if (sne == null)
+			return;
+
 		Function1<String,String> fullTextFunction = sne.getParameter("textEditorFullText"); 
 		if(fullTextFunction != null)
 			es.currentText = fullTextFunction.apply(es.base.textElementId);
@@ -114,10 +117,12 @@ class EditorStateManager {
 
 	void applyEdit() {
 		SingleElementNode sne = node.getSingleElementNode();
-		EditorState es = currentState();
-		Function2<String,String,Object> editor = sne.getParameter("textEditor");
-		if(editor != null) {
-			editor.apply(es.base.textElementId, es.currentText);
+		if (sne != null) {
+			EditorState es = currentState();
+			Function2<String,String,Object> editor = sne.getParameter("textEditor");
+			if(editor != null) {
+				editor.apply(es.base.textElementId, es.currentText);
+			}
 		}
 	}