Set scope directly

wiremod · Dec 12, 2024 · 65440ca · 65440ca
1 parent 1c0896e
commit 65440ca
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lua/entities/gmod_wire_expression2/base/compiler.lua b/lua/entities/gmod_wire_expression2/base/compiler.lua
@@ -621,13 +621,13 @@ local CompileVisitors = {
 		self.scope.data.ops = self.scope.data.ops + 5
 
 		return function(state) ---@param state RuntimeContext
-			local depth = state.ScopeID
+			local scope, scope_id = state.Scope, state.ScopeID
 			state:PushScope()
 				local ok, err = pcall(try_block, state)
-			while state.ScopeID > depth do -- Dump all scopes that may have been created in between
+			if ok then
 				state:PopScope()
-			end
-			if not ok then
+			else
+				state.Scope, state.ScopeID = scope, scope_id -- Skip back any scopes that may have been created in try_block
 				local catchable, msg = E2Lib.unpackException(err)
 				if catchable then
 					state:PushScope()