diff options
| author | Kenneth Skovhede <kenneth@hexad.dk> | 2019-09-20 13:59:54 +0300 |
|---|---|---|
| committer | Kenneth Skovhede <kenneth@hexad.dk> | 2019-09-20 13:59:54 +0300 |
| commit | 0cfbfb8c1e0f4a0b443b55f1152ba32b0395f1b9 (patch) | |
| tree | 47cc083555c1547ba937d410d132db64e07e8133 | |
| parent | f1cf209e866738d75fdd43cd022b15cf1890cb45 (diff) | |
| parent | 81ac1bf3a3ffb051ee5743e7d978450fba91c433 (diff) | |
Merge branch 'feature/fix-null-error-for-non-hosted-server'
| -rw-r--r-- | Duplicati/GUI/Duplicati.GUI.TrayIcon/HttpServerConnection.cs | 7 |
1 files 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;
|