# # # patch "src/view/MainWindow.cpp" # from [059275538c0562f8e529a5e9ee742a9cd61d5525] # to [8e4b32d0cdc7891375c109d0f3c408d3fcc0245e] # ============================================================ --- src/view/MainWindow.cpp 059275538c0562f8e529a5e9ee742a9cd61d5525 +++ src/view/MainWindow.cpp 8e4b32d0cdc7891375c109d0f3c408d3fcc0245e @@ -204,24 +204,6 @@ bool MainWindow::doLoadWorkspace(QString return true; } -void MainWindow::closeEvent(QCloseEvent * event) -{ - I(closeCounter >= 0); - - // ignore the close event if there are still open dialog windows - if (closeCounter > 0) - { - D(QString("Ignoring close request for %1").arg((int)this)); - event->ignore(); - return; - } - - // the last closed window sets the geometry for the next one which is opened - Settings::setWindowGeometry(saveGeometry(), "MainWindow_mode" + mode); - event->accept(); - emit windowClosed(this); -} - void MainWindow::on_actionOpen_Database_triggered() { QString fn = QFileDialog::getOpenFileName( @@ -655,6 +637,24 @@ void MainWindow::disableClosing() closeCounter++; } +void MainWindow::closeEvent(QCloseEvent * event) +{ + I(closeCounter >= 0); + + // ignore the close event if there are still open dialog windows + if (closeCounter > 0) + { + D(QString("Ignoring close request for %1").arg((int)this)); + event->ignore(); + return; + } + + // the last closed window sets the geometry for the next one which is opened + Settings::setWindowGeometry(saveGeometry(), "MainWindow_mode" + mode); + event->accept(); + emit windowClosed(this); +} + void MainWindow::on_actionReload_workspace_triggered() { bool ret = invModel->readInventory();