Merge pull request #12991 from luiscuenca/avatarScript

Avatar Scripts

John Conklin II committed 8 years ago

Commit 7a5fce42 parents 83d370f 689fbd216 files · +177 −9Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngines.cpp+4−2

@@ -427,11 +427,13 @@ bool ScriptEngines::stopScript(const QString& rawScriptURL, bool restart) { · 426 unmodified lines
427	427	if (_scriptEnginesHash.contains(scriptURL)) {
428	428	ScriptEnginePointer scriptEngine = _scriptEnginesHash[scriptURL];
429	429	if (restart) {
	430	+ bool isUserLoaded = scriptEngine->isUserLoaded();
	431	+ ScriptEngine::Type type = scriptEngine->getType();
430	432	auto scriptCache = DependencyManager::get<ScriptCache>();
431	433	scriptCache->deleteScript(scriptURL);
432	434	connect(scriptEngine.data(), &ScriptEngine::finished,
433		− this, [this](QString scriptName, ScriptEnginePointer engine) {
434		− reloadScript(scriptName);
	435	+ this, [this, isUserLoaded, type](QString scriptName, ScriptEnginePointer engine) {
	436	+ reloadScript(scriptName, isUserLoaded)->setType(type);
435	437	});
436	438	}
437	439	scriptEngine->stop();