[citizen:scripting:core] replace std::mutex with std::recursive_mutex…

… for m_scriptRuntimesLock (fixes INVOKE_FUNCTION_REFERENCE not working from side a Lua tick)
ByModzMaster · Nov 30, 2015 · bdd94d7 · bdd94d7
1 parent 7b1a65d
commit bdd94d7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/components/citizen-scripting-core/include/ResourceScriptingComponent.h b/components/citizen-scripting-core/include/ResourceScriptingComponent.h
@@ -22,7 +22,7 @@ class ResourceScriptingComponent : public fwRefCountable
 
 	std::map<int32_t, fx::OMPtr<IScriptRuntime>> m_scriptRuntimes;
 
-	std::mutex m_scriptRuntimesLock;
+	std::recursive_mutex m_scriptRuntimesLock;
 
 private:
 	void CreateEnvironments();
@@ -37,14 +37,14 @@ class ResourceScriptingComponent : public fwRefCountable
 
 	inline void AddRuntime(OMPtr<IScriptRuntime> runtime)
 	{
-		std::unique_lock<std::mutex> lock(m_scriptRuntimesLock);
+		std::unique_lock<std::recursive_mutex> lock(m_scriptRuntimesLock);
 
 		m_scriptRuntimes.insert({ runtime->GetInstanceId(), runtime });
 	}
 
 	inline OMPtr<IScriptRuntime> GetRuntimeById(int32_t instanceId)
 	{
-		std::unique_lock<std::mutex> lock(m_scriptRuntimesLock);
+		std::unique_lock<std::recursive_mutex> lock(m_scriptRuntimesLock);
 
 		auto it = m_scriptRuntimes.find(instanceId);
 

diff --git a/components/citizen-scripting-core/src/ResourceScriptingComponent.cpp b/components/citizen-scripting-core/src/ResourceScriptingComponent.cpp
@@ -77,7 +77,7 @@ ResourceScriptingComponent::ResourceScriptingComponent(Resource* resource)
 			OMPtr<IScriptRuntime> ptr;
 			if (SUCCEEDED(environment.As(&ptr)))
 			{
-				std::unique_lock<std::mutex> lock(m_scriptRuntimesLock);
+				std::unique_lock<std::recursive_mutex> lock(m_scriptRuntimesLock);
 
 				ptr->SetParentObject(resource);
 
@@ -93,7 +93,7 @@ ResourceScriptingComponent::ResourceScriptingComponent(Resource* resource)
 
 	resource->OnTick.Connect([=] ()
 	{
-		std::unique_lock<std::mutex> lock(m_scriptRuntimesLock);
+		std::unique_lock<std::recursive_mutex> lock(m_scriptRuntimesLock);
 
 		for (auto& environment : m_scriptRuntimes)
 		{
@@ -108,7 +108,7 @@ ResourceScriptingComponent::ResourceScriptingComponent(Resource* resource)
 
 	resource->OnStop.Connect([=] ()
 	{
-		std::unique_lock<std::mutex> lock(m_scriptRuntimesLock);
+		std::unique_lock<std::recursive_mutex> lock(m_scriptRuntimesLock);
 
 		for (auto& environment : m_scriptRuntimes)
 		{
@@ -123,7 +123,7 @@ OMPtr<IScriptHost> GetScriptHostForResource(Resource* resource);
 
 void ResourceScriptingComponent::CreateEnvironments()
 {
-	std::unique_lock<std::mutex> lock(m_scriptRuntimesLock);
+	std::unique_lock<std::recursive_mutex> lock(m_scriptRuntimesLock);
 
 	m_scriptHost = GetScriptHostForResource(m_resource);