From bb0071e8ca1bac82d029d26fb109f9f9f62137ed Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Sun, 11 Aug 2024 03:11:46 -0400
Subject: [PATCH] Fix script engine memory leak

---
 include/scriptutility.h      |  4 +++-
 src/scriptapi/apiutility.cpp | 28 +++++++++++++++++++---------
 src/scriptapi/scripting.cpp  | 14 +++++++++++---
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/include/scriptutility.h b/include/scriptutility.h
index 639e71f6..0d6fca75 100644
--- a/include/scriptutility.h
+++ b/include/scriptutility.h
@@ -10,7 +10,8 @@ class ScriptUtility : public QObject
 
 public:
     ScriptUtility(MainWindow *mainWindow);
-    void clearActions();
+    ~ScriptUtility();
+
     QString getActionFunctionName(int actionIndex);
     Q_INVOKABLE bool registerAction(QString functionName, QString actionName, QString shortcut = "");
     Q_INVOKABLE bool registerToggleAction(QString functionName, QString actionName, QString shortcut = "", bool checked = false);
@@ -59,6 +60,7 @@ private:
 
     MainWindow *window;
     QList<QAction *> registeredActions;
+    QSet<QTimer *> activeTimers;
     QHash<int, QString> actionMap;
 };
 
diff --git a/src/scriptapi/apiutility.cpp b/src/scriptapi/apiutility.cpp
index 38ff3e39..d2b8ebf3 100644
--- a/src/scriptapi/apiutility.cpp
+++ b/src/scriptapi/apiutility.cpp
@@ -7,6 +7,18 @@ ScriptUtility::ScriptUtility(MainWindow *mainWindow) {
     this->window = mainWindow;
 }
 
+ScriptUtility::~ScriptUtility() {
+    if (window && window->ui && window->ui->menuTools) {
+        for (auto action : this->registeredActions) {
+            window->ui->menuTools->removeAction(action);
+        }
+    }
+    for (auto timer : this->activeTimers) {
+        timer->stop();
+        delete timer;
+    }
+}
+
 bool ScriptUtility::registerAction(QString functionName, QString actionName, QString shortcut) {
     if (!window || !window->ui || !window->ui->menuTools)
         return false;
@@ -44,12 +56,6 @@ bool ScriptUtility::registerToggleAction(QString functionName, QString actionNam
     return true;
 }
 
-void ScriptUtility::clearActions() {
-    for (auto action : this->registeredActions) {
-        window->ui->menuTools->removeAction(action);
-    }
-}
-
 QString ScriptUtility::getActionFunctionName(int actionIndex) {
     return this->actionMap.value(actionIndex);
 }
@@ -58,11 +64,15 @@ void ScriptUtility::setTimeout(QJSValue callback, int milliseconds) {
   if (!callback.isCallable() || milliseconds < 0)
       return;
 
-    QTimer *timer = new QTimer(0);
+    QTimer *timer = new QTimer();
     connect(timer, &QTimer::timeout, [=](){
-        this->callTimeoutFunction(callback);
+        if (this->activeTimers.remove(timer)) {
+            this->callTimeoutFunction(callback);
+            timer->deleteLater();
+        }
     });
-    connect(timer, &QTimer::timeout, timer, &QTimer::deleteLater);
+
+    this->activeTimers.insert(timer);
     timer->setSingleShot(true);
     timer->start(milliseconds);
 }
diff --git a/src/scriptapi/scripting.cpp b/src/scriptapi/scripting.cpp
index 82944be9..95a4325f 100644
--- a/src/scriptapi/scripting.cpp
+++ b/src/scriptapi/scripting.cpp
@@ -1,8 +1,10 @@
+#include <QQmlEngine>
+
 #include "scripting.h"
 #include "log.h"
 #include "config.h"
 
-QMap<CallbackType, QString> callbackFunctions = {
+const QMap<CallbackType, QString> callbackFunctions = {
     {OnProjectOpened, "onProjectOpened"},
     {OnProjectClosed, "onProjectClosed"},
     {OnBlockChanged, "onBlockChanged"},
@@ -24,8 +26,9 @@ Scripting *instance = nullptr;
 void Scripting::stop() {
     if (!instance) return;
     instance->engine->setInterrupted(true);
-    instance->scriptUtility->clearActions();
     qDeleteAll(instance->imageCache);
+    delete instance->engine;
+    delete instance->scriptUtility;
     delete instance;
     instance = nullptr;
 }
@@ -39,7 +42,7 @@ void Scripting::init(MainWindow *mainWindow) {
 
 Scripting::Scripting(MainWindow *mainWindow) {
     this->mainWindow = mainWindow;
-    this->engine = new QJSEngine(mainWindow);
+    this->engine = new QJSEngine();
     this->engine->installExtensions(QJSEngine::ConsoleExtension);
     const QStringList paths = userConfig.getCustomScriptPaths();
     const QList<bool> enabled = userConfig.getCustomScriptsEnabled();
@@ -79,6 +82,11 @@ void Scripting::populateGlobalObject(MainWindow *mainWindow) {
     instance->engine->globalObject().setProperty("overlay", instance->engine->newQObject(mainWindow->ui->graphicsView_Map));
     instance->engine->globalObject().setProperty("utility", instance->engine->newQObject(instance->scriptUtility));
 
+    // Note: QJSEngine also has these functions, but not in Qt 5.15.
+    QQmlEngine::setObjectOwnership(mainWindow, QQmlEngine::CppOwnership);
+    QQmlEngine::setObjectOwnership(mainWindow->ui->graphicsView_Map, QQmlEngine::CppOwnership);
+    QQmlEngine::setObjectOwnership(instance->scriptUtility, QQmlEngine::CppOwnership);
+
     QJSValue constants = instance->engine->newObject();
 
     // Get version numbers