Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-08-21 16:15:58 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix editor's map/layout clearing if a map/layout fails to load

Browse Source
This commit is contained in:
GriffinR
2024-12-23 11:42:57 -05:00
parent 0d939772bf
commit 40adedef34
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/editor.cpp
View File

@@ -1242,10 +1242,10 @@ QString Editor::getMovementPermissionText(uint16_t collision, uint16_t elevation
void Editor::unsetMap() {
// disconnect previous map's signals so they are not firing
// multiple times if set again in the future
if (map) {
map->pruneEditHistory();
map->disconnect(this);
for (auto connection : map->getConnections())
if (this->map) {
this->map->pruneEditHistory();
this->map->disconnect(this);
for (const auto &connection : this->map->getConnections())
disconnectMapConnection(connection);
}
clearMapConnections();
@@ -1258,13 +1258,12 @@ bool Editor::setMap(QString map_name) {
return false;
}
unsetMap();
Map *loadedMap = project->loadMap(map_name);
if (!loadedMap) {
return false;
}
unsetMap();
this->map = loadedMap;
setLayout(map->layout()->id);
@@ -1291,13 +1290,17 @@ bool Editor::setLayout(QString layoutId) {
return false;
}
this->layout = this->project->loadLayout(layoutId);
Layout *loadedLayout = this->project->loadLayout(layoutId);
if (!loadedLayout) {
return false;
}
this->layout = loadedLayout;
if (!displayLayout()) {
return false;
}
editGroup.addStack(&layout->editHistory);
editGroup.addStack(&this->layout->editHistory);
map_ruler->setMapDimensions(QSize(this->layout->getWidth(), this->layout->getHeight()));
connect(this->layout, &Layout::layoutDimensionsChanged, map_ruler, &MapRuler::setMapDimensions);