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

Fix AdvanceMap import memory leaks, revert name change

Browse Source
This commit is contained in:
GriffinR 2024-12-03 16:08:53 -05:00
parent ba4a43d595
commit b7c34a67e5
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
forms/mainwindow.ui
View File

@ -2931,7 +2931,7 @@
<addaction name="actionTileset_Editor"/>
<addaction name="actionRegion_Map_Editor"/>
<addaction name="separator"/>
<addaction name="actionImport_Layout_from_Advance_Map_1_92"/>
<addaction name="actionImport_Map_from_Advance_Map_1_92"/>
<addaction name="separator"/>
<addaction name="actionOpen_Project_in_Text_Editor"/>
</widget>
@ -3222,9 +3222,9 @@
<string>Open Config Folder</string>
</property>
</action>
<action name="actionImport_Layout_from_Advance_Map_1_92">
<action name="actionImport_Map_from_Advance_Map_1_92">
<property name="text">
<string>Import Layout from Advance Map 1.92...</string>
<string>Import Map from Advance Map 1.92...</string>
</property>
</action>
<action name="actionProject_Settings">

2
include/mainwindow.h
View File

@ -234,7 +234,7 @@ private slots:
void on_action_Export_Map_Image_triggered();
void on_actionExport_Stitched_Map_Image_triggered();
void on_actionExport_Map_Timelapse_Image_triggered();
void on_actionImport_Layout_from_Advance_Map_1_92_triggered();
void on_actionImport_Map_from_Advance_Map_1_92_triggered();
void on_pushButton_AddConnection_clicked();
void on_button_OpenDiveMap_clicked();

6
src/mainwindow.cpp
View File

@ -2636,8 +2636,8 @@ void MainWindow::on_actionExport_Map_Timelapse_Image_triggered() {
showExportMapImageWindow(ImageExporterMode::Timelapse);
}
void MainWindow::on_actionImport_Layout_from_Advance_Map_1_92_triggered() {
QString filepath = FileDialog::getOpenFileName(this, "Import Layout from Advance Map 1.92", "", "Advance Map 1.92 Map Files (*.map)");
void MainWindow::on_actionImport_Map_from_Advance_Map_1_92_triggered() {
QString filepath = FileDialog::getOpenFileName(this, "Import Map from Advance Map 1.92", "", "Advance Map 1.92 Map Files (*.map)");
if (filepath.isEmpty()) {
return;
}
@ -2658,8 +2658,8 @@ void MainWindow::on_actionImport_Layout_from_Advance_Map_1_92_triggered() {
auto dialog = new NewLayoutDialog(this->editor->project, mapLayout, this);
connect(dialog, &NewLayoutDialog::applied, this, &MainWindow::userSetLayout);
connect(dialog, &NewLayoutDialog::finished, [mapLayout] { mapLayout->deleteLater(); });
dialog->open();
delete mapLayout;
}
void MainWindow::showExportMapImageWindow(ImageExporterMode mode) {

1
src/ui/tileseteditor.cpp
View File

@ -987,6 +987,7 @@ void TilesetEditor::importTilesetMetatiles(Tileset *tileset, bool primary)
msgBox.setDefaultButton(QMessageBox::Ok);
msgBox.setIcon(QMessageBox::Icon::Critical);
msgBox.exec();
qDeleteAll(metatiles);
return;
}