diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index a1bbe68efa..ca87c812d3 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -4110,7 +4110,7 @@ void Application::loadScript(const QString& fileNameString) { QThread* workerThread = new QThread(this); // when the worker thread is started, call our engine's run.. - connect(workerThread, SIGNAL(started()), scriptEngine, SLOT(run())); + connect(workerThread, &QThread::started, scriptEngine, &ScriptEngine::run); // when the thread is terminated, add both scriptEngine and thread to the deleteLater queue connect(scriptEngine, SIGNAL(finished(const QString&)), scriptEngine, SLOT(deleteLater())); diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index 04f932fec8..f8dac39adc 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -106,6 +106,7 @@ bool ScriptEngine::setScriptContents(const QString& scriptContents) { } void ScriptEngine::init() { + qDebug() << "Init called!"; if (_isInitialized) { return; // only initialize once } @@ -334,4 +335,3 @@ void ScriptEngine::stopTimer(QTimer *timer) { delete timer; } } - diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h index 12909a16eb..98d5860332 100644 --- a/libraries/script-engine/src/ScriptEngine.h +++ b/libraries/script-engine/src/ScriptEngine.h @@ -60,13 +60,14 @@ public: void setAvatarData(AvatarData* avatarData, const QString& objectName); + void init(); + void run(); /// runs continuously until Agent.stop() is called + void evaluate(); /// initializes the engine, and evaluates the script, but then returns control to caller + void timerFired(); public slots: - void init(); - void run(); /// runs continuously until Agent.stop() is called void stop(); - void evaluate(); /// initializes the engine, and evaluates the script, but then returns control to caller QObject* setInterval(const QScriptValue& function, int intervalMS); QObject* setTimeout(const QScriptValue& function, int timeoutMS);