Fix project settings editor regression

huderlem · Oct 1, 2023 · 6ee76f8 · 6ee76f8
1 parent 56d53d2
commit 6ee76f8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/forms/projectsettingseditor.ui b/forms/projectsettingseditor.ui
@@ -282,6 +282,9 @@
              <property name="toolTip">
               <string>The file that will be used to populate the Prefabs tab</string>
              </property>
+             <property name="placeholderText">
+              <string>prefabs.json</string>
+             </property>
             </widget>
            </item>
            <item row="0" column="0">

diff --git a/src/ui/projectsettingseditor.cpp b/src/ui/projectsettingseditor.cpp
@@ -389,13 +389,15 @@ void ProjectSettingsEditor::closeEvent(QCloseEvent* event) {
         return;
     }
 
-    if (this->projectNeedsReload) {
-        if (this->prompt("Settings changed, reload project to apply changes?") == QMessageBox::Yes)
-            emit this->reloadProject();
-    }
-
     porymapConfig.setProjectSettingsEditorGeometry(
         this->saveGeometry(),
         this->saveState()
     );
+
+    if (this->projectNeedsReload) {
+        if (this->prompt("Settings changed, reload project to apply changes?") == QMessageBox::Yes){
+            // Reloading the project will destroy this window, no other work should happen after this signal is emitted
+            emit this->reloadProject();
+        }
+    }
 }