Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 09:09:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7813 from ZappoMan/fixRecursiveMutex

Browse source 
fix recursive mutex in Entites.callEntityMethod()
This commit is contained in:
samcake 2016-05-05 10:06:58 -07:00
commit a78719bc85
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -415,12 +415,12 @@ void EntityScriptingInterface::deleteEntity(QUuid id) {
} }
void EntityScriptingInterface::setEntitiesScriptEngine(EntitiesScriptEngineProvider* engine) { void EntityScriptingInterface::setEntitiesScriptEngine(EntitiesScriptEngineProvider* engine) {
std::lock_guard<std::mutex> lock(_entitiesScriptEngineLock); std::lock_guard<std::recursive_mutex> lock(_entitiesScriptEngineLock);
_entitiesScriptEngine = engine; _entitiesScriptEngine = engine;
} }
void EntityScriptingInterface::callEntityMethod(QUuid id, const QString& method, const QStringList& params) { void EntityScriptingInterface::callEntityMethod(QUuid id, const QString& method, const QStringList& params) {
std::lock_guard<std::mutex> lock(_entitiesScriptEngineLock); std::lock_guard<std::recursive_mutex> lock(_entitiesScriptEngineLock);
if (_entitiesScriptEngine) { if (_entitiesScriptEngine) {
EntityItemID entityID{ id }; EntityItemID entityID{ id };
_entitiesScriptEngine->callEntityScriptMethod(entityID, method, params); _entitiesScriptEngine->callEntityScriptMethod(entityID, method, params);

2
libraries/entities/src/EntityScriptingInterface.h
View file

@ -215,7 +215,7 @@ private:
EntityTreePointer _entityTree; EntityTreePointer _entityTree;
std::mutex _entitiesScriptEngineLock; std::recursive_mutex _entitiesScriptEngineLock;
EntitiesScriptEngineProvider* _entitiesScriptEngine { nullptr }; EntitiesScriptEngineProvider* _entitiesScriptEngine { nullptr };
bool _bidOnSimulationOwnership { false }; bool _bidOnSimulationOwnership { false };