Check correct label in scriptas() when none is provided

EngineHub · Oct 18, 2017 · b21a10d · b21a10d
1 parent 9f2b7c8
commit b21a10d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/com/laytonsmith/core/functions/Meta.java b/src/main/java/com/laytonsmith/core/functions/Meta.java
@@ -562,8 +562,10 @@ public Construct execs(Target t, Environment environment, Script parent, ParseTr
 			String originalLabel = environment.getEnv(GlobalEnv.class).GetLabel();
 			if (nodes.length == 3) {
 				offset++;
-				String label = environment.getEnv(GlobalEnv.class).GetScript().seval(nodes[1], environment).val();
+				String label = parent.seval(nodes[1], environment).val();
 				environment.getEnv(GlobalEnv.class).SetLabel(label);
+			} else {
+				environment.getEnv(GlobalEnv.class).SetLabel(parent.getLabel());
 			}
 			environment.getEnv(CommandHelperEnvironment.class).SetPlayer(p);
 			parent.enforceLabelPermissions();