diff --git a/CHANGELOG.md b/CHANGELOG.md index 12b3417c..802a9516 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ and this project somewhat adheres to [Semantic Versioning](https://semver.org/sp ### Fixed - Fix rare crash while quitting Porymap. +- Fix `Edit > Clear Map Entries` in the Region Map Editor not saving the applied changes. - Fix exported images on macOS using a different color space than in Porymap. - Fix some `INCBIN` statements not being parsed correctly. - Fix excessive logging if Porymap fails to monitor all map files. diff --git a/src/project.cpp b/src/project.cpp index 85a6b420..6fd27b17 100644 --- a/src/project.cpp +++ b/src/project.cpp @@ -2652,8 +2652,8 @@ bool Project::readRegionMapSections() { } void Project::setRegionMapEntries(const QHash &entries) { - for (auto it = entries.constBegin(); it != entries.constEnd(); it++) { - this->locationData[it.key()].map = it.value(); + for (auto it = this->locationData.keyBegin(); it != this->locationData.keyEnd(); it++) { + this->locationData[*it].map = entries.value(*it); } } diff --git a/src/ui/regionmapeditor.cpp b/src/ui/regionmapeditor.cpp index 61514661..513d3971 100644 --- a/src/ui/regionmapeditor.cpp +++ b/src/ui/regionmapeditor.cpp @@ -1190,7 +1190,7 @@ void RegionMapEditor::on_action_RegionMap_ClearLayout_triggered() { QMessageBox::StandardButton result = QMessageBox::question( this, "WARNING", - QString("This action will reset the entire map layout to %1, continue?").arg(this->region_map->default_map_section), + QString("This action will reset the entire map layout to %1. Continue?").arg(this->region_map->default_map_section), QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Yes ); @@ -1212,7 +1212,7 @@ void RegionMapEditor::on_action_RegionMap_ClearEntries_triggered() { QMessageBox::StandardButton result = QMessageBox::question( this, "WARNING", - "This action will remove the entire mapsection entries list, continue?", + "This action will clear all the data on the Map Entries tab. Continue?", QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Yes );