From 6d39d3afd439f9a47251f5e909098a0e7ec74323 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 24 Sep 2024 11:59:44 -0400 Subject: [PATCH] fix project close order and clear new layout combo --- src/mainwindow.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 3df6b0e1..0f123149 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1304,6 +1304,7 @@ void MainWindow::clearProjectUI() { const QSignalBlocker blocker8(ui->comboBox_DiveMap); const QSignalBlocker blocker9(ui->comboBox_EmergeMap); const QSignalBlocker blockerA(ui->lineEdit_filterBox); + const QSignalBlocker blockerB(ui->comboBox_LayoutSelector); ui->comboBox_Song->clear(); ui->comboBox_Location->clear(); @@ -1315,6 +1316,7 @@ void MainWindow::clearProjectUI() { ui->comboBox_DiveMap->clear(); ui->comboBox_EmergeMap->clear(); ui->lineEdit_filterBox->clear(); + ui->comboBox_LayoutSelector->clear(); // Clear map models if (this->mapGroupModel) { @@ -3676,8 +3678,8 @@ bool MainWindow::closeProject() { return false; } } - clearProjectUI(); editor->closeProject(); + clearProjectUI(); setWindowDisabled(true); setWindowTitle(QCoreApplication::applicationName());