Merge branch 'master' into develop

2018-05-09 19:25:58 +02:00
parent aae6d09fd3 0a155d89a3
commit b02bd59e0c
6 changed files with 42 additions and 21 deletions
--- a/src/browser/NativeMessagingHost.cpp
+++ b/src/browser/NativeMessagingHost.cpp
@@ -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);
        }