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
5151 if (scriptMenuName) {
5252 _scriptMenuName = "Stop ";
5353 _scriptMenuName.append(scriptMenuName);
54+ _scriptMenuName.append(QString(" [%1]").arg(_scriptNumber));
5455 } else {
5556 _scriptMenuName = "Stop Script ";
56− _scriptNumber++;
5757 _scriptMenuName.append(_scriptNumber);
5858 }
59+ _scriptNumber++;
5960 _menu = menu;
6061 _controllerScriptingInterface = controllerScriptingInterface;
6162 }
@@ -223,6 +224,7 @@ void ScriptEngine::run() { · 161 unmodified lines
223224 qDebug() << "Uncaught exception at line" << line << ":" << _engine.uncaughtException().toString();
224225 }
225226 }
227+ emit scriptEnding();
226228 cleanMenuItems();
227229
228230 // If we were on a thread, then wait till it's done