From ee5d85b171bb32a843e5739b77590ecd71a2567f Mon Sep 17 00:00:00 2001
From: garak <garakmon@gmail.com>
Date: Wed, 7 Aug 2019 11:17:20 -0400
Subject: [PATCH] fix new map layout dir creation and erroneous error

---
 src/ui/newmappopup.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ui/newmappopup.cpp b/src/ui/newmappopup.cpp
index 5b306856..53cac7d2 100644
--- a/src/ui/newmappopup.cpp
+++ b/src/ui/newmappopup.cpp
@@ -131,6 +131,7 @@ void NewMapPopup::on_pushButton_NewMap_Accept_clicked() {
 
     if (this->existingLayout) {
         layout = this->project->mapLayouts.value(this->layoutId);
+        newMap->needsLayoutDir = false;
     } else {
         layout = new MapLayout;
         layout->id = MapLayout::layoutConstantFromName(newMapName);
@@ -156,7 +157,7 @@ void NewMapPopup::on_pushButton_NewMap_Accept_clicked() {
     group = project->groupNames->indexOf(this->ui->comboBox_NewMap_Group->currentText());
     newMap->layout = layout;
     newMap->layoutId = layout->id;
-    project->loadMapLayout(newMap);
+    if (this->existingLayout) project->loadMapLayout(newMap);
     newMap->group_num = QString::number(group);
     map = newMap;
     emit applied();