fix crash native proc

OpenDreamProject · Dec 8, 2024 · 58fc167 · 58fc167
1 parent c9f8c51
commit 58fc167
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/OpenDreamRuntime/DreamThread.cs b/OpenDreamRuntime/DreamThread.cs
@@ -211,10 +211,8 @@ public static DreamValue Run(DreamProc proc, DreamObject src, DreamObject? usr,
             var context = new DreamThread(proc.ToString());
 
             if (proc is NativeProc nativeProc) {
-                var zone = Profiler.BeginZone(filePath:"Native Proc", lineNumber:0, memberName:nativeProc.Name);
-                var result = nativeProc.Call(context, src, usr, new(arguments));
-                zone?.Dispose();
-                return result;
+                using(Profiler.BeginZone(filePath:"Native Proc", lineNumber:0, memberName:nativeProc.Name))
+                    return nativeProc.Call(context, src, usr, new(arguments));
             }
 
             var state = proc.CreateState(context, src, usr, new DreamProcArguments(arguments));

diff --git a/OpenDreamRuntime/Procs/DMProc.cs b/OpenDreamRuntime/Procs/DMProc.cs
@@ -488,9 +488,8 @@ public void SetReturn(DreamValue value) {
         public ProcStatus Call(DreamProc proc, DreamObject? src, DreamProcArguments arguments) {
             if (proc is NativeProc p) {
                 // Skip a whole song and dance.
-                var zone = Profiler.BeginZone(filePath:"Native Proc", lineNumber:0, memberName:p.Name);
-                Push(p.Call(Thread, src, Usr, arguments));
-                zone?.Dispose();
+                using(Profiler.BeginZone(filePath:"Native Proc", lineNumber:0, memberName:p.Name))
+                    Push(p.Call(Thread, src, Usr, arguments));
                 return ProcStatus.Continue;
             }