stop timers when the script does, add cleanup methods

Stephen Birarda committed 12 years ago

Commit e2842ab1 parent 9dd8c113 files · +28 −12Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+20−7

     }
 }
-void ScriptEngine::setupTimerWithInterval(const QScriptValue& function, int intervalMS, bool isSingleShot) {
+QObject* ScriptEngine::setupTimerWithInterval(const QScriptValue& function, int intervalMS, bool isSingleShot) {
     // create the timer, add it to the map, and start it
     QTimer* newTimer = new QTimer(this);
+    newTimer->setSingleShot(isSingleShot);
     connect(newTimer, &QTimer::timeout, this, &ScriptEngine::timerFired);
-    _timerFunctionMap.insert(newTimer, function);
-    newTimer->setSingleShot(isSingleShot);
+    // make sure the timer stops when the script does
+    connect(this, &ScriptEngine::scriptEnding, newTimer, &QTimer::stop);
+    _timerFunctionMap.insert(newTimer, function);
     newTimer->start(intervalMS);
+    return newTimer;
+}
+QObject* ScriptEngine::setInterval(const QScriptValue& function, int intervalMS) {
+    return setupTimerWithInterval(function, intervalMS, false);
 }
-void ScriptEngine::setInterval(const QScriptValue& function, int intervalMS) {
+QObject* ScriptEngine::setTimeout(const QScriptValue& function, int timeoutMS) {
-    setupTimerWithInterval(function, intervalMS, false);
+    return setupTimerWithInterval(function, timeoutMS, true);
 }
-void ScriptEngine::setTimeout(const QScriptValue& function, int timeoutMS) {
+void ScriptEngine::stopTimer(QTimer *timer) {
-    setupTimerWithInterval(function, timeoutMS, true);
+    if (_timerFunctionMap.contains(timer)) {
+        timer->stop();
+        _timerFunctionMap.remove(timer);
+        delete timer;
+    }
 }