allow returns from compile_string

R2NorthstarTools · Aug 30, 2024 · a7616e8 · a7616e8
1 parent b76bf68
commit a7616e8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/high/squirrel.rs b/src/high/squirrel.rs
@@ -732,7 +732,7 @@ pub fn compile_string(
         if result != SQRESULT::SQRESULT_ERROR {
             (sqfunctions.sq_pushroottable)(sqvm.as_ptr());
 
-            if (sqfunctions.sq_call)(sqvm.as_ptr(), 1, 0, 0) == SQRESULT::SQRESULT_ERROR {
+            if (sqfunctions.sq_call)(sqvm.as_ptr(), 1, 1, 1) == SQRESULT::SQRESULT_ERROR {
                 Err(SQCompileError::BufferFailedToExecute)
             } else {
                 Ok(())

diff --git a/src/macros/entry.rs b/src/macros/entry.rs
@@ -235,6 +235,7 @@ macro_rules! entry {
                         .expect("sqvm should not be null on sqvm destroy");
                     let handle = high::squirrel::CSquirrelVMHandle::new(sqvm, context, true, token);
                     PLUGIN.wait().on_sqvm_destroyed(&handle, token);
+                    unsafe { $crate::high::engine_sync::run_async_routine() }; // run all possible stuff to not leak into next sqvm
                 }
                 fn OnLibraryLoaded(
                     &self,