From 24562fdaae3c00211f94ba9d7cffe5dbb1de7cb5 Mon Sep 17 00:00:00 2001
From: garak <garakmon@gmail.com>
Date: Mon, 20 May 2019 22:33:28 -0400
Subject: [PATCH] handle un-numbered map groups when creating new maps

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

diff --git a/src/ui/newmappopup.cpp b/src/ui/newmappopup.cpp
index c07691e9..2b01784e 100644
--- a/src/ui/newmappopup.cpp
+++ b/src/ui/newmappopup.cpp
@@ -53,7 +53,7 @@ void NewMapPopup::setDefaultValues(int groupNum, QString mapSec) {
     ui->comboBox_NewMap_Secondary_Tileset->addItems(tilesets.value("secondary"));
 
     ui->comboBox_NewMap_Group->addItems(*project->groupNames);
-    ui->comboBox_NewMap_Group->setCurrentText("gMapGroup" + QString::number(groupNum));
+    ui->comboBox_NewMap_Group->setCurrentText(project->groupNames->at(groupNum));
 
     if (existingLayout) {
         ui->spinBox_NewMap_Width->setValue(project->mapLayouts.value(layoutId)->width.toInt(nullptr, 0));
@@ -151,7 +151,7 @@ void NewMapPopup::on_pushButton_NewMap_Accept_clicked() {
         newMap->allowEscapeRope = this->ui->checkBox_NewMap_Allow_Escape_Rope->isChecked() ? "1" : "0";
     }
 
-    group = this->ui->comboBox_NewMap_Group->currentText().remove("gMapGroup").toInt();
+    group = project->groupNames->indexOf(this->ui->comboBox_NewMap_Group->currentText());
     newMap->layout = layout;
     newMap->layoutId = layout->id;
     project->loadMapLayout(newMap);