Merge branch 'master' into keep-import-path

CHANGELOG.md

@@ -13,6 +13,9 @@ The **"Breaking Changes"** listed below are changes that have been made in the d
 ### Changed
 - The last-used directory is now preserved in import/export file dialogs.
 
+### Fixed
+- Fix New Map settings being preserved when switching projects.
+
 ## [5.0.0] - 2022-10-30
 ### Breaking Changes
 - Proper support for pokefirered's clone objects was added, which requires the changes made in [pokefirered/#484](https://github.com/pret/pokefirered/pull/484).

include/mainwindow.h

@@ -329,7 +329,7 @@ private:
     bool isProgrammaticEventTabChange;
     bool projectHasUnsavedChanges;
     bool projectOpenFailure = false;
-    bool openedNewMapDialog = false;
+    bool newMapDefaultsSet = false;
 
     MapSortOrder mapSortOrder;
 

src/mainwindow.cpp

@@ -531,6 +531,7 @@ bool MainWindow::openProject(QString dir) {
 
     this->closeSupplementaryWindows();
     this->setProjectSpecificUIVisibility();
+    this->newMapDefaultsSet = false;
 
     Scripting::init(this);
     bool already_open = isProjectOpen() && (editor->project->root == dir);
@@ -1193,9 +1194,9 @@ void MainWindow::onNewMapCreated() {
 }
 
 void MainWindow::openNewMapPopupWindow() {
-    if (!openedNewMapDialog) {
+    if (!this->newMapDefaultsSet) {
         NewMapPopup::setDefaultSettings(this->editor->project);
-        openedNewMapDialog = true;
+        this->newMapDefaultsSet = true;
     }
     if (!this->newMapPrompt) {
         this->newMapPrompt = new NewMapPopup(this, this->editor->project);