From 81ac1bf3a3ffb051ee5743e7d978450fba91c433 Mon Sep 17 00:00:00 2001 From: Kenneth Skovhede Date: Fri, 20 Sep 2019 12:49:28 +0200 Subject: [PATCH] Added guards to prevent a null-error when attempting to connect to a password protected server without a password. --- .../GUI/Duplicati.GUI.TrayIcon/HttpServerConnection.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/HttpServerConnection.cs b/Duplicati/GUI/Duplicati.GUI.TrayIcon/HttpServerConnection.cs index 6b74095ba..d42af3fd0 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/HttpServerConnection.cs +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/HttpServerConnection.cs @@ -383,15 +383,16 @@ namespace Duplicati.GUI.TrayIcon switch (m_passwordSource) { case Program.PasswordSource.Database: - Program.databaseConnection.ApplicationSettings.ReloadSettings(); + if (Program.databaseConnection != null) + Program.databaseConnection.ApplicationSettings.ReloadSettings(); - if (Program.databaseConnection.ApplicationSettings.WebserverPasswordTrayIcon != m_password) + if (Program.databaseConnection != null && Program.databaseConnection.ApplicationSettings.WebserverPasswordTrayIcon != m_password) m_password = Program.databaseConnection.ApplicationSettings.WebserverPasswordTrayIcon; else hasTriedPassword = true; break; case Program.PasswordSource.HostedServer: - if (Server.Program.DataConnection.ApplicationSettings.WebserverPassword != m_password) + if (Server.Program.DataConnection != null && Server.Program.DataConnection.ApplicationSettings.WebserverPassword != m_password) m_password = Server.Program.DataConnection.ApplicationSettings.WebserverPassword; else hasTriedPassword = true;