Merge branch 'release/2.6.2' into develop

2020-09-27 12:05:33 -04:00
parent ac5c1af829 9fd9d65995
commit e1c2537084
32 changed files with 1109 additions and 851 deletions
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -1274,6 +1274,8 @@ bool MainWindow::saveLastDatabases()
 void MainWindow::updateTrayIcon()
 {
    if (isTrayIconEnabled()) {
+        QApplication::setQuitOnLastWindowClosed(false);
+
        if (!m_trayIcon) {
            m_trayIcon = new QSystemTrayIcon(this);
            auto* menu = new QMenu(this);
@@ -1312,6 +1314,8 @@ void MainWindow::updateTrayIcon()
            m_trayIcon->setIcon(resources()->trayIconLocked());
        }
    } else {
+        QApplication::setQuitOnLastWindowClosed(true);
+
        if (m_trayIcon) {
            m_trayIcon->hide();
            delete m_trayIcon;