don't call enterEntity until script preload has finished

Seth Alves committed 8 years ago

Commit f6e57f51 parent d5c0c055 files · +45 −5Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 5 files). Show all

Unified · Split

@@ -2442,6 +2442,8 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co · 2441 unmodified lines
2442	// if we got this far, then call the preload method	2442	// if we got this far, then call the preload method
2443	callEntityScriptMethod(entityID, "preload");	2443	callEntityScriptMethod(entityID, "preload");
2444		2444
		2445	emit entityScriptPreloadFinished(entityID);
		2446
2445	_occupiedScriptURLs.remove(entityScript);	2447	_occupiedScriptURLs.remove(entityScript);
2446	processDeferredEntityLoads(entityScript, entityID);	2448	processDeferredEntityLoads(entityScript, entityID);
2447	}	2449	}