Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2026-01-09 04:21:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release/2.6.2' into develop

Browse source
This commit is contained in:
Jonathan White 2020-09-27 12:05:33 -04:00
commit e1c2537084
No known key found for this signature in database
GPG key ID: 440FC65F2E0C6E01
32 changed files with 1109 additions and 851 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/gui/MainWindow.cpp
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;