History

fix possible thread issue with Entities.callEntityMethod()

Brad Hefta-Gaub committed 10 years ago

Commit 1c111e21 parent 47900df2 files · +9 −1Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+6−0
@@ -414,7 +414,13 @@ void EntityScriptingInterface::deleteEntity(QUuid id) { · 413 unmodified lines
414414 }
415415 }
416416
417+void EntityScriptingInterface::setEntitiesScriptEngine(EntitiesScriptEngineProvider* engine) {
418+ std::unique_lock<std::mutex> lock(_entitiesScriptEngineLock);
419+ _entitiesScriptEngine = engine;
420+}
421+
417422 void EntityScriptingInterface::callEntityMethod(QUuid id, const QString& method, const QStringList& params) {
423+ std::unique_lock<std::mutex> lock(_entitiesScriptEngineLock);
418424 if (_entitiesScriptEngine) {
419425 EntityItemID entityID{ id };
420426 _entitiesScriptEngine->callEntityScriptMethod(entityID, method, params);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t