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

fix project close order and clear new layout combo

Browse source
This commit is contained in:
garak 2024-09-24 11:59:44 -04:00
parent 815a16e8ca
commit 6d39d3afd4
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mainwindow.cpp
View file

@ -1304,6 +1304,7 @@ void MainWindow::clearProjectUI() {
const QSignalBlocker blocker8(ui->comboBox_DiveMap); const QSignalBlocker blocker8(ui->comboBox_DiveMap);
const QSignalBlocker blocker9(ui->comboBox_EmergeMap); const QSignalBlocker blocker9(ui->comboBox_EmergeMap);
const QSignalBlocker blockerA(ui->lineEdit_filterBox); const QSignalBlocker blockerA(ui->lineEdit_filterBox);
const QSignalBlocker blockerB(ui->comboBox_LayoutSelector);
ui->comboBox_Song->clear(); ui->comboBox_Song->clear();
ui->comboBox_Location->clear(); ui->comboBox_Location->clear();
@ -1315,6 +1316,7 @@ void MainWindow::clearProjectUI() {
ui->comboBox_DiveMap->clear(); ui->comboBox_DiveMap->clear();
ui->comboBox_EmergeMap->clear(); ui->comboBox_EmergeMap->clear();
ui->lineEdit_filterBox->clear(); ui->lineEdit_filterBox->clear();
ui->comboBox_LayoutSelector->clear();
// Clear map models // Clear map models
if (this->mapGroupModel) { if (this->mapGroupModel) {
@ -3676,8 +3678,8 @@ bool MainWindow::closeProject() {
return false; return false;
} }
} }
clearProjectUI();
editor->closeProject(); editor->closeProject();
clearProjectUI();
setWindowDisabled(true); setWindowDisabled(true);
setWindowTitle(QCoreApplication::applicationName()); setWindowTitle(QCoreApplication::applicationName());