History

reload qml with scripts

Zach Pomerantz committed 10 years ago

Commit aeaae4c1 parent 3c82a484 files · +16 −12Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngines.cpp+8−12
@@ -16,6 +16,8 @@ · 15 unmodified lines
1616 #include <UserActivityLogger.h>
1717 #include <PathUtils.h>
1818
19+#include <OffscreenUi.h>
20+
1921 #include "ScriptEngine.h"
2022 #include "ScriptEngineLogging.h"
2123
@@ -367,28 +369,21 @@ QStringList ScriptEngines::getRunningScripts() { · 345 unmodified lines
367369
368370 void ScriptEngines::stopAllScripts(bool restart) {
369371 QReadLocker lock(&_scriptEnginesHashLock);
370− if (restart) {
371− // Delete all running scripts from cache so that they are re-downloaded when they are restarted
372− auto scriptCache = DependencyManager::get<ScriptCache>();
373− for (QHash<QUrl, ScriptEngine*>::const_iterator it = _scriptEnginesHash.constBegin();
374− it != _scriptEnginesHash.constEnd(); it++) {
375− if (!it.value()->isFinished()) {
376− scriptCache->deleteScript(it.key());
377− }
378− }
379− }
380−
381− // Stop and possibly restart all currently running scripts
382372 for (QHash<QUrl, ScriptEngine*>::const_iterator it = _scriptEnginesHash.constBegin();
383373 it != _scriptEnginesHash.constEnd(); it++) {
374+ // skip already stopped scripts
384375 if (it.value()->isFinished() || it.value()->isStopping()) {
385376 continue;
386377 }
378+
379+ // queue user scripts if restarting
387380 if (restart && it.value()->isUserLoaded()) {
388381 connect(it.value(), &ScriptEngine::finished, this, [this](QString scriptName, ScriptEngine* engine) {
389382 reloadScript(scriptName);
390383 });
391384 }
385+
386+ // stop all scripts
392387 it.value()->stop(true);
393388 qCDebug(scriptengine) << "stopping script..." << it.key();
394389 }
@@ -431,6 +426,7 @@ void ScriptEngines::setScriptsLocation(const QString& scriptsLocation) { · 36 unmodified lines
431426
432427 void ScriptEngines::reloadAllScripts() {
433428 DependencyManager::get<ScriptCache>()->clearCache();
429+ DependencyManager::get<OffscreenUi>()->clearCache();
434430 emit scriptsReloading();
435431 stopAllScripts(true);
436432 }

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