haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added guards to prevent a null-error when attempting to connect to a password protected server without a password.

Browse Source
This commit is contained in:
Kenneth Skovhede
2019-09-20 12:49:28 +02:00
parent 5503ad7f2c
commit 81ac1bf3a3
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/GUI/Duplicati.GUI.TrayIcon/HttpServerConnection.cs
+4 -3
View File
@@ -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;