From: lempinen <lempinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Tue, 26 Feb 2013 13:05:16 +0000 (+0000)
Subject: Check that ExpressionComposite is not disposed before modifying it (fixes #4124)
X-Git-Tag: simantics-1.10.1~21
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=f91de6eca97108e97d827bde5feed6338d7359d8;p=simantics%2Fsysdyn.git

Check that ExpressionComposite is not disposed before modifying it (fixes #4124)

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@26915 ac1ea38d-2e2b-0410-8846-a27921b304fc
---

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ExpressionWidget.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ExpressionWidget.java
index e0a996f6..e6cf9c57 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ExpressionWidget.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ExpressionWidget.java
@@ -132,7 +132,7 @@ public class ExpressionWidget implements Widget {
 	 * expression change its type (false) 
 	 */
 	public void displayExpression(String expressionType, boolean original) {
-		if(expressionType == null) {
+		if(expressionType == null || parent.isDisposed()) {
 			return;
 		}