Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-06-20 12:44:47 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Janek Bevendorff 2018-05-09 19:25:58 +02:00
commit b02bd59e0c
No known key found for this signature in database
GPG key ID: 2FDEB0D40BCA5E11
6 changed files with 42 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/browser/NativeMessagingHost.cpp
View file

@ -80,7 +80,7 @@ void NativeMessagingHost::run()
QFile::remove(serverPath);
// Ensure that STDIN is not being listened when proxy is used
if (m_notifier->isEnabled()) {
if (m_notifier && m_notifier->isEnabled()) {
m_notifier->setEnabled(false);
}