Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-10-12 21:40:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse source
This commit is contained in:
Vladimir Svyatski 2018-05-10 22:34:38 +03:00
commit 30ccc102d2
53 changed files with 9817 additions and 1144 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/gui/MainWindow.cpp
View file

@ -65,7 +65,7 @@ class BrowserPlugin : public ISettingsPage
public:
BrowserPlugin(DatabaseTabWidget* tabWidget)
{
m_nativeMessagingHost = QSharedPointer<NativeMessagingHost>(new NativeMessagingHost(tabWidget));
m_nativeMessagingHost = QSharedPointer<NativeMessagingHost>(new NativeMessagingHost(tabWidget, BrowserSettings::isEnabled()));
}
~BrowserPlugin()
@ -686,7 +686,7 @@ void MainWindow::closeEvent(QCloseEvent* event)
bool minimizeOnClose = isTrayIconEnabled() && config()->get("GUI/MinimizeOnClose").toBool();
if (minimizeOnClose && !m_appExitCalled) {
event->ignore();
event->accept();
hideWindow();
if (config()->get("security/lockdatabaseminimize").toBool()) {