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

Call GenerateWebserverPasswordTrayIcon from one place only.

Browse Source
This commit is contained in:
verhoek
2019-02-25 11:35:43 +01:00
parent b57f679899
commit 8330d7bdb9
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/Server/Database/ServerSettings.cs
-1
View File
@@ -338,7 +338,6 @@ namespace Duplicati.Server.Database
}
SaveSettings();
GenerateWebserverPasswordTrayIcon();
}
public void SetAllowedHostnames(string allowedHostnames)
Duplicati/Server/Program.cs
+7 -4
View File
@@ -236,13 +236,16 @@ namespace Duplicati.Server
StartOrStopUsageReporter();
if (commandlineOptions.ContainsKey("webservice-password"))
Program.DataConnection.ApplicationSettings.SetWebserverPassword(commandlineOptions["webservice-password"]);
{
DataConnection.ApplicationSettings.SetWebserverPassword(commandlineOptions["webservice-password"]);
}
Program.DataConnection.ApplicationSettings.GenerateWebserverPasswordTrayIcon();
DataConnection.ApplicationSettings.GenerateWebserverPasswordTrayIcon();
if (commandlineOptions.ContainsKey("webservice-allowed-hostnames"))
Program.DataConnection.ApplicationSettings.SetAllowedHostnames(commandlineOptions["webservice-allowed-hostnames"]);
{
DataConnection.ApplicationSettings.SetAllowedHostnames(commandlineOptions["webservice-allowed-hostnames"]);
}
ApplicationExitEvent = new System.Threading.ManualResetEvent(false);