Use main luastate when registering events handlers

By default, when addEventHandler gets called, it passes a coroutine state, which is inacceptible and may get broken in future, this will lead to infinity call of main(). To avoid this problem, we have to use a main luastate instead. Thank you, FYP
Northn · Nov 11, 2022 · d5e8109 · d5e8109
1 parent 80b28dd
commit d5e8109
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/RakLua.cpp b/src/RakLua.cpp
@@ -43,10 +43,12 @@ void RakLua::postRakClientInitialization(uintptr_t rakClientIntf)
 	mState = eInitState::OK;
 }
 
-bool RakLua::addEventHandler(sol::this_state& ts, eEventType type, sol::function detour)
+bool RakLua::addEventHandler(sol::this_state& ts, eEventType type, sol::function &detour_f)
 {
 	sol::state_view lua{ ts };
 	int id = lua["script"]["this"]["id"];
+	auto main_thread = sol::main_thread(ts);
+	sol::protected_function detour(main_thread, detour_f);
 
 	switch (type)
 	{

diff --git a/src/RakLua.h b/src/RakLua.h
@@ -30,7 +30,7 @@ class RakLua
 
 	void		postRakClientInitialization(uintptr_t rakClientIntf);
 
-	bool		addEventHandler(sol::this_state& ts, eEventType type, sol::function detour);
+	bool		addEventHandler(sol::this_state& ts, eEventType type, sol::function &detour_f);
 	void		destroyHandlers(sol::this_state& ts);
 
 	inline bool			isInitialized() { return mState == eInitState::OK; }

diff --git a/src/main.cpp b/src/main.cpp
@@ -234,7 +234,7 @@ sol::table open(sol::this_state ts)
 		gRakLua.initialize();
 
 	sol::table module = lua.create_table();
-	module["VERSION"] = 2.11;
+	module["VERSION"] = 2.12;
 	module.set_function("getState", &getState);
 
 	module.set_function("registerHandler", &registerHandler);