From c2135b2f8cffdb2b23ce3d7b76f539e352b1b636 Mon Sep 17 00:00:00 2001
From: maelstrom <maelstrom@maelstrom.dev>
Date: Mon, 7 Jul 2025 22:21:16 +0200
Subject: [PATCH] fix(editor): script not reopening after being closed

---
 editor/mainwindow.cpp          | 25 +++++++++++++++++--------
 editor/mainwindow.h            |  3 ++-
 editor/script/scriptdocument.h |  2 ++
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/editor/mainwindow.cpp b/editor/mainwindow.cpp
index 2b14a5a..111c496 100644
--- a/editor/mainwindow.cpp
+++ b/editor/mainwindow.cpp
@@ -572,15 +572,26 @@ std::optional<std::string> MainWindow::openFileDialog(QString filter, QString de
     return dialog.selectedFiles().front().toStdString();
 }
 
+ScriptDocument* MainWindow::findScriptWindow(std::shared_ptr<Script> script) {
+    for (QMdiSubWindow* window : ui->mdiArea->subWindowList()) {
+        ScriptDocument* doc = dynamic_cast<ScriptDocument*>(window);
+        if (doc == nullptr) continue;
+
+        if (doc->getScript() == script)
+            return doc;
+    }
+    return nullptr;
+}
+
 void MainWindow::openScriptDocument(std::shared_ptr<Script> script) {
     // Document already exists, don't open it
-    if (scriptDocuments.count(script) > 0) {
-        ui->mdiArea->setActiveSubWindow(scriptDocuments[script]);
+    ScriptDocument* doc = findScriptWindow(script);
+    if (doc != nullptr) {
+        ui->mdiArea->setActiveSubWindow(doc);
         return;
     }
 
-    ScriptDocument* doc = new ScriptDocument(script);
-    scriptDocuments[script] = doc;
+    doc = new ScriptDocument(script);
     doc->setAttribute(Qt::WA_DeleteOnClose, true);
     ui->mdiArea->addSubWindow(doc);
     ui->mdiArea->setActiveSubWindow(doc);
@@ -588,12 +599,10 @@ void MainWindow::openScriptDocument(std::shared_ptr<Script> script) {
 }
 
 void MainWindow::closeScriptDocument(std::shared_ptr<Script> script) {
-    if (scriptDocuments.count(script) == 0) return;
-
-    ScriptDocument* doc = scriptDocuments[script];
+    ScriptDocument* doc = findScriptWindow(script);
+    if (doc == nullptr) return; // Script is not open
     ui->mdiArea->removeSubWindow(doc);
     ui->mdiArea->activeSubWindow()->showMaximized();
-    scriptDocuments.erase(script);
     doc->deleteLater();
 }
 
diff --git a/editor/mainwindow.h b/editor/mainwindow.h
index 4f8adae..195d053 100644
--- a/editor/mainwindow.h
+++ b/editor/mainwindow.h
@@ -12,6 +12,7 @@
 #include <map>
 #include <memory>
 #include <qfiledialog.h>
+#include <qmdisubwindow.h>
 
 enum SelectedTool {
     TOOL_SELECT,
@@ -67,10 +68,10 @@ public:
     friend PlaceDocument;
 private:
     PlaceDocument* placeDocument;
-    std::map<std::shared_ptr<Script>, ScriptDocument*> scriptDocuments;
 
     void updateToolbars();
     void closeEvent(QCloseEvent* evt) override;
+    ScriptDocument* findScriptWindow(std::shared_ptr<Script>);
 
     void connectActionHandlers();
     
diff --git a/editor/script/scriptdocument.h b/editor/script/scriptdocument.h
index 51311de..801d8ec 100644
--- a/editor/script/scriptdocument.h
+++ b/editor/script/scriptdocument.h
@@ -15,4 +15,6 @@ class ScriptDocument : public QMdiSubWindow {
 public:
     ScriptDocument(std::shared_ptr<Script> script, QWidget* parent = nullptr);
     ~ScriptDocument() override;
+
+    inline std::shared_ptr<Script> getScript() { return script; }
 };
\ No newline at end of file