make getJSONParameters thread-safe

Stephen Birarda committed 9 years ago

Commit 33cde411 parent 916a7324 files · +11 −4Browse files

Showing the changes to assignment-client/src/scripts/EntityScriptServer.cpp (1 of 4 files). Show all

Unified · Split

assignment-client/src/scripts/EntityScriptServer.cpp+1−0

@@ -246,6 +246,7 @@ void EntityScriptServer::checkAndCallPreload(const EntityItemID& entityID, const · 245 unmodified lines
246	if (entity && entity->shouldPreloadServerScript() && _entitiesScriptEngine) {	246	if (entity && entity->shouldPreloadServerScript() && _entitiesScriptEngine) {
247	QString scriptUrl = entity->getServerScripts();	247	QString scriptUrl = entity->getServerScripts();
248	scriptUrl = ResourceManager::normalizeURL(scriptUrl);	248	scriptUrl = ResourceManager::normalizeURL(scriptUrl);
		249	qDebug() << "Loading entity server script" << scriptUrl << "for" << entityID;
249	ScriptEngine::loadEntityScript(_entitiesScriptEngine, entityID, scriptUrl, reload);	250	ScriptEngine::loadEntityScript(_entitiesScriptEngine, entityID, scriptUrl, reload);
250	entity->serverScriptHasPreloaded();	251	entity->serverScriptHasPreloaded();
251	}	252	}