Merge branch 'release/2.6.2' into develop

This commit is contained in:
Jonathan White committed 2020-09-27 12:11:02 -04:00
commit e1c2537084
32 files changed
+1109 -851

No files matched your search

+4
View File
@@ -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;