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

Fix crash in layout selector

Browse Source
This commit is contained in:
GriffinR 2025-03-14 16:12:35 -04:00
parent 7cfbcda9c2
commit f4d4980aad
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/mainwindow.cpp
View File

@ -1064,13 +1064,26 @@ void MainWindow::displayMapProperties() {
}
void MainWindow::on_comboBox_LayoutSelector_currentTextChanged(const QString &text) {
if (editor && editor->project && editor->map) {
if (editor->project->mapLayouts.contains(text)) {
editor->map->setLayout(editor->project->loadLayout(text));
setMap(editor->map->name());
markMapEdited();
}
if (!this->editor || !this->editor->project || !this->editor->map)
return;
if (!this->editor->project->mapLayouts.contains(text)) {
// User may be in the middle of typing the name of a layout, don't bother trying to load it.
return;
}
Layout* layout = this->editor->project->loadLayout(text);
if (!layout) {
RecentErrorMessage::show(QString("Unable to set layout '%1'.").arg(text), this);
// New layout failed to load, restore previous layout
const QSignalBlocker b(ui->comboBox_LayoutSelector);
ui->comboBox_LayoutSelector->setCurrentText(this->editor->map->layout()->id);
return;
}
this->editor->map->setLayout(layout);
setMap(this->editor->map->name());
markMapEdited();
}
// Update the UI using information we've read from the user's project files.