X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=core%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Ffile%2Fopenrocket%2Fimportt%2FOpenRocketLoader.java;fp=core%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Ffile%2Fopenrocket%2Fimportt%2FOpenRocketLoader.java;h=4efdf9dbd5f962b15ce2bccbec136884c2796d63;hb=c482637086621542ea78ba8818f315dce0a11dc2;hp=f4c615a1b1e68bc26c1373f88779d5df0e7f9b8c;hpb=c322e9329373aa7f0b071663874327da7e650082;p=debian%2Fopenrocket

diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java b/core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java
index f4c615a1..4efdf9db 100644
--- a/core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java
+++ b/core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java
@@ -704,8 +704,6 @@ class OpenRocketContentHandler extends AbstractElementHandler {
 	}
 }
 
-
-
 class DatatypeHandler extends AbstractElementHandler {
 	private final DocumentLoadingContext context;
 	private final OpenRocketContentHandler contentHandler;
@@ -1288,10 +1286,14 @@ class SimulationsHandler extends AbstractElementHandler {
 	public void closeElement(String element, HashMap<String, String> attributes,
 			String content, WarningSet warnings) throws SAXException {
 		attributes.remove("status");
+		
+		//Finished loading. Rebuilding custom expressions in case something has changed such as listener variable come available.
+		for (CustomExpression exp : doc.getCustomExpressions()){
+			exp.setExpression(exp.getExpressionString());
+		}
+		
 		super.closeElement(element, attributes, content, warnings);
 	}
-	
-	
 }
 
 class SingleSimulationHandler extends AbstractElementHandler {