Merge pull request #5825 from thoys/20655

CR for Job #20655 - Add ability to close one script from another script

Andrew Meadows committed 11 years ago

Commit 3af13292 parents 084ba8a f38bb774 files · +39 −30Browse files

Showing the changes to interface/src/Application.cpp (1 of 4 files). Show all

Unified · Split

     _overlays.init(); // do this before scripts load
     _runningScriptsWidget->setRunningScripts(getRunningScripts());
-    connect(_runningScriptsWidget, &RunningScriptsWidget::stopScriptName, this, &Application::stopScript);
     connect(this, SIGNAL(aboutToQuit()), this, SLOT(saveScripts()));
     connect(this, SIGNAL(aboutToQuit()), this, SLOT(aboutToQuit()));
     _myAvatar->clearScriptableSettings();
 }
-void Application::stopScript(const QString &scriptName, bool restart) {
+bool Application::stopScript(const QString& scriptHash, bool restart) {
-    const QString& scriptURLString = QUrl(scriptName).toString();
+    bool stoppedScript = false;
-    if (_scriptEnginesHash.contains(scriptURLString)) {
+    if (_scriptEnginesHash.contains(scriptHash)) {
-        ScriptEngine* scriptEngine = _scriptEnginesHash[scriptURLString];
+        ScriptEngine* scriptEngine = _scriptEnginesHash[scriptHash];
         if (restart) {
             auto scriptCache = DependencyManager::get<ScriptCache>();
-            scriptCache->deleteScript(scriptName);
+            scriptCache->deleteScript(QUrl(scriptHash));
             connect(scriptEngine, SIGNAL(finished(const QString&)), SLOT(reloadScript(const QString&)));
         }
         scriptEngine->stop();
-        qCDebug(interfaceapp) << "stopping script..." << scriptName;
+        stoppedScript = true;
+        qCDebug(interfaceapp) << "stopping script..." << scriptHash;
         // HACK: ATM scripts cannot set/get their animation priorities, so we clear priorities
         // whenever a script stops in case it happened to have been setting joint rotations.
         // TODO: expose animation priorities and provide a layered animation control system.
     if (_scriptEnginesHash.empty()) {
         _myAvatar->clearScriptableSettings();
     }
+    return stoppedScript;
 }
 void Application::reloadAllScripts() {