Merge pull request Tencent#117 from kimixuchen/UnLua-fs

execCallLua增加校验，从蓝图字节码执行过来不用SkipCode EX_CallLua
liu6yang · Mar 8, 2020 · 9a44a59 · 9a44a59
2 parents 630447b + c0cd524
commit 9a44a59
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Plugins/UnLua/Source/UnLua/Private/LuaFunctionInjection.cpp b/Plugins/UnLua/Source/UnLua/Private/LuaFunctionInjection.cpp
@@ -36,7 +36,11 @@ DEFINE_FUNCTION(FLuaInvoker::execCallLua)
         }
         else
         {
-            Stack.SkipCode(1);      // skip EX_CallLua
+            if (Func->GetNativeFunc() == (FNativeFuncPtr)&FLuaInvoker::execCallLua)
+            {
+                check(*Stack.Code == EX_CallLua);
+                Stack.SkipCode(1);      // skip EX_CallLua only when called from native func
+            }
         }
     }