fix recursive mutex in Entites.callEntityMethod()

Brad Hefta-Gaub committed 10 years ago

Commit 2c960841 parent bbf358f2 files · +3 −3Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 2 files). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+2−2

@@ -415,12 +415,12 @@ void EntityScriptingInterface::deleteEntity(QUuid id) { · 414 unmodified lines
415	}	415	}
416		416
417	void EntityScriptingInterface::setEntitiesScriptEngine(EntitiesScriptEngineProvider* engine) {	417	void EntityScriptingInterface::setEntitiesScriptEngine(EntitiesScriptEngineProvider* engine) {
418	std::lock_guard<std::mutex> lock(_entitiesScriptEngineLock);	418	std::lock_guard<std::recursive_mutex> lock(_entitiesScriptEngineLock);
419	_entitiesScriptEngine = engine;	419	_entitiesScriptEngine = engine;
420	}	420	}
421		421
422	void EntityScriptingInterface::callEntityMethod(QUuid id, const QString& method, const QStringList& params) {	422	void EntityScriptingInterface::callEntityMethod(QUuid id, const QString& method, const QStringList& params) {
423	std::lock_guard<std::mutex> lock(_entitiesScriptEngineLock);	423	std::lock_guard<std::recursive_mutex> lock(_entitiesScriptEngineLock);
424	if (_entitiesScriptEngine) {	424	if (_entitiesScriptEngine) {
425	EntityItemID entityID{ id };	425	EntityItemID entityID{ id };
426	_entitiesScriptEngine->callEntityScriptMethod(entityID, method, params);	426	_entitiesScriptEngine->callEntityScriptMethod(entityID, method, params);