fix(citizen-scripting-core): fixed ClearTimeout after Wait

code/components/citizen-scripting-core/include/fxScripting.idl

@@ -190,6 +190,8 @@ interface IScriptHostWithBookmarks : fxIBase
 
 	void RemoveBookmarks(in IScriptTickRuntimeWithBookmarks runtime);
 
+	void RemoveBookmark(in IScriptTickRuntimeWithBookmarks runtime, in uint64_t bookmark);
+
 	void CreateBookmarks(in IScriptTickRuntimeWithBookmarks runtime);
 };
 

code/components/citizen-scripting-core/src/ScriptHost.cpp

@@ -112,6 +112,34 @@ static void RemoveBookmarks(IScriptTickRuntimeWithBookmarks* scRT)
 	bookmarkRefs.resourceInsertionIterators.erase(scRT);
 }
 
+static void RemoveBookmark(IScriptTickRuntimeWithBookmarks* scRT, uint64_t bookmark)
+{
+	auto exIt = (bookmarkRefs.executing) ? bookmarkRefs.executingIt : nullptr;
+
+	auto list = &bookmarkRefs.list;
+
+	{
+		for (auto it = list->begin(); it != list->end();)
+		{
+			if (it->bookmark == bookmark)
+			{
+				if (exIt && *exIt == it)
+				{
+					*exIt = it = list->erase(it);
+				}
+				else
+				{
+					it = list->erase(it);
+				}
+			}
+			else
+			{
+				++it;
+			}
+		}
+	}
+}
+
 static void RunBookmarks()
 {
 	bookmarkRefs.executing = true;
@@ -501,6 +529,13 @@ result_t TestScriptHost::CreateBookmarks(IScriptTickRuntimeWithBookmarks* scRT)
 	return FX_S_OK;
 }
 
+result_t TestScriptHost::RemoveBookmark(IScriptTickRuntimeWithBookmarks* scRT, uint64_t bookmark)
+{
+	::RemoveBookmark(scRT, bookmark);
+	return FX_S_OK;
+}
+
+
 result_t TestScriptHost::ScheduleBookmark(IScriptTickRuntimeWithBookmarks* scRT, uint64_t bookmark, int64_t deadline)
 {
 	auto newDeadline = std::chrono::microseconds{

code/components/citizen-scripting-lua/include/LuaScriptRuntime.h

@@ -380,6 +380,8 @@ class LuaScriptRuntime : public OMClass<LuaScriptRuntime, IScriptRuntime, IScrip
 
 	void SchedulePendingBookmarks();
 
+	bool RemoveBookmark(uint64_t bookmark);
+
 public:
 	NS_DECL_ISCRIPTRUNTIME;
 

code/components/citizen-scripting-lua/src/LuaScriptRuntime.cpp

@@ -1157,22 +1157,8 @@ static int Lua_ClearTimeout(lua_State* L)
 	int bookmark = luaL_checkinteger(L, 1);
 
 	auto& luaRuntime = fx::LuaScriptRuntime::GetCurrent();
-	lua_State* runtimeState = luaRuntime->GetState();
-
-	bool removed = false;
-
-	auto& pending = luaRuntime->GetPendingBookmarks();
-	for (auto it = pending.begin(); it != pending.end(); ++it)
-	{
-		if (std::get<0>(*it) == static_cast<uint64_t>(bookmark))
-		{
-			pending.erase(it);
-
-			luaL_unref(runtimeState, LUA_REGISTRYINDEX, bookmark);
-			removed = true;
-			break;
-		}
-	}
+	lua_State* runtimeState = luaRuntime->GetRunningThread();
+	bool removed = luaRuntime->RemoveBookmark(bookmark);
 
 	lua_pushboolean(L, removed);
 	return 1;
@@ -1300,6 +1286,13 @@ void LuaScriptRuntime::SchedulePendingBookmarks()
 	}
 }
 
+bool LuaScriptRuntime::RemoveBookmark(uint64_t bookmark)
+{
+	result_t success = GetScriptHostWithBookmarks()->RemoveBookmark(this, bookmark);
+
+	return success == FX_S_OK;
+}
+
 void LuaScriptRuntime::SetTickRoutine(const std::function<void(uint64_t, bool)>& tickRoutine)
 {
 	if (!m_tickRoutine)