From 9432aca0f496418c7103223307b1b7243371e094 Mon Sep 17 00:00:00 2001 From: lempinen Date: Fri, 31 Aug 2012 09:34:38 +0000 Subject: [PATCH] Added a null check. Expression validation treats sheet references as sheet names, but they can also be actual functions. The validation did not take this into account. (fixes #3665) git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@25555 ac1ea38d-2e2b-0410-8846-a27921b304fc --- .../src/org/simantics/sysdyn/ui/utils/ExpressionUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/ExpressionUtils.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/ExpressionUtils.java index fa3d62ab..c9419675 100644 --- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/ExpressionUtils.java +++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/ExpressionUtils.java @@ -186,7 +186,7 @@ public class ExpressionUtils { current = getElement(current, parts[i]); } - if(current == null) { + if(current == null && conf.getModuleType() != null) { // Sheets are currently located in the model root. Try to find the sheet. current = conf.getModuleType().getParent(); // Get module type parent (should be a model) if(current instanceof Model) -- 2.47.1