History

Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface

Brad Hefta-Gaub committed 12 years ago

Commit bc2830d2 parents ab9e01c a4e3f0649 files · +1193 −7862Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+3−1
@@ -51,11 +51,12 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, · 50 unmodified lines
51 if (scriptMenuName) {51 if (scriptMenuName) {
52 _scriptMenuName = "Stop ";52 _scriptMenuName = "Stop ";
53 _scriptMenuName.append(scriptMenuName);53 _scriptMenuName.append(scriptMenuName);
54 _scriptMenuName.append(QString(" [%1]").arg(_scriptNumber));
54 } else {55 } else {
55 _scriptMenuName = "Stop Script ";56 _scriptMenuName = "Stop Script ";
56 _scriptNumber++;
57 _scriptMenuName.append(_scriptNumber);57 _scriptMenuName.append(_scriptNumber);
58 }58 }
59 _scriptNumber++;
59 _menu = menu;60 _menu = menu;
60 _controllerScriptingInterface = controllerScriptingInterface;61 _controllerScriptingInterface = controllerScriptingInterface;
61}62}
@@ -223,6 +224,7 @@ void ScriptEngine::run() { · 161 unmodified lines
223 qDebug() << "Uncaught exception at line" << line << ":" << _engine.uncaughtException().toString();224 qDebug() << "Uncaught exception at line" << line << ":" << _engine.uncaughtException().toString();
224 }225 }
225 }226 }
227 emit scriptEnding();
226 cleanMenuItems();228 cleanMenuItems();
227 229
228 // If we were on a thread, then wait till it's done230 // If we were on a thread, then wait till it's done