atiran/porymap
3
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix crash when creating new map

Browse source
This commit is contained in:
BigBahss 2021-02-18 19:37:55 -05:00 committed by huderlem
parent b0e3b862e1
commit a4fc2bcb30
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/mainwindow.cpp
View file

@ -1105,10 +1105,10 @@ void MainWindow::onAddNewMapToLayoutClick(QAction* triggeredAction)
void MainWindow::onNewMapCreated() {
QString newMapName = this->newmapprompt->map->name;
int newMapGroup = this->newmapprompt->group;
Map *newMap_ = this->newmapprompt->map;
Map *newMap = this->newmapprompt->map;
bool existingLayout = this->newmapprompt->existingLayout;
Map *newMap = editor->project->addNewMapToGroup(newMapName, newMapGroup, newMap_, existingLayout);
newMap = editor->project->addNewMapToGroup(newMapName, newMapGroup, newMap, existingLayout);
logInfo(QString("Created a new map named %1.").arg(newMapName));
@ -1132,6 +1132,7 @@ void MainWindow::onNewMapCreated() {
}
disconnect(this->newmapprompt, &NewMapPopup::applied, this, &MainWindow::onNewMapCreated);
delete newMap;
}
void MainWindow::openNewMapPopupWindow(int type, QVariant data) {

1
src/project.cpp
View file

@ -1856,7 +1856,6 @@ Map* Project::addNewMapToGroup(QString mapName, int groupNum, Map *newMap, bool
loadMapTilesets(newMap);
setNewMapEvents(newMap);
setNewMapConnections(newMap);
mapCache.insert(mapName, newMap);
return newMap;
}