diff options
| author | Kenneth Skovhede <kenneth@hexad.dk> | 2018-04-13 09:50:47 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-13 09:50:47 +0300 |
| commit | c0aa960b72c9d45f581413b33249c152414c639b (patch) | |
| tree | 3d2e6aebec4a0c5e5b6f9439d3dd9e7ab1dd7bb7 | |
| parent | 64c8f72143982d10765aea9bad5652f448e30363 (diff) | |
| parent | e6587a2c6f60528121bf6c286a9debe9e8705427 (diff) | |
Merge pull request #3166 from warwickmm/fix_server_setting_accessors
Fix server setting property accessors
| -rw-r--r-- | Duplicati/Server/Database/ServerSettings.cs | 48 |
1 files changed, 19 insertions, 29 deletions
diff --git a/Duplicati/Server/Database/ServerSettings.cs b/Duplicati/Server/Database/ServerSettings.cs index 2ba5d3716..bafb09355 100644 --- a/Duplicati/Server/Database/ServerSettings.cs +++ b/Duplicati/Server/Database/ServerSettings.cs @@ -188,10 +188,6 @@ namespace Duplicati.Server.Database {
get
{
- var tp = m_values[CONST.IS_FIRST_RUN];
- if (string.IsNullOrEmpty(tp))
- return true;
-
return Duplicati.Library.Utility.Utility.ParseBoolOption(m_values, CONST.IS_FIRST_RUN);
}
set
@@ -202,29 +198,25 @@ namespace Duplicati.Server.Database }
} - public bool HasAskedForPasswordProtection - { - get - { - var tp = m_values[CONST.HAS_ASKED_FOR_PASSWORD_PROTECTION]; - if (string.IsNullOrEmpty(tp)) - return true; - - return Duplicati.Library.Utility.Utility.ParseBoolOption(m_values, CONST.HAS_ASKED_FOR_PASSWORD_PROTECTION); - } - set - { - lock (m_connection.m_lock) - m_values[CONST.HAS_ASKED_FOR_PASSWORD_PROTECTION] = value.ToString(); - SaveSettings(); - } - } + public bool HasAskedForPasswordProtection + { + get + {
+ return Duplicati.Library.Utility.Utility.ParseBoolOption(m_values, CONST.HAS_ASKED_FOR_PASSWORD_PROTECTION);
+ } + set + { + lock (m_connection.m_lock) + m_values[CONST.HAS_ASKED_FOR_PASSWORD_PROTECTION] = value.ToString(); + SaveSettings(); + } + } - public bool UnackedError
+ public bool UnackedError
{
get
{
- return Duplicati.Library.Utility.Utility.ParseBoolOption(m_values, CONST.UNACKED_ERROR);
+ return Duplicati.Library.Utility.Utility.ParseBool(m_values[CONST.UNACKED_ERROR], false);
}
set
{
@@ -238,7 +230,7 @@ namespace Duplicati.Server.Database {
get
{
- return Duplicati.Library.Utility.Utility.ParseBoolOption(m_values, CONST.UNACKED_WARNING);
+ return Duplicati.Library.Utility.Utility.ParseBool(m_values[CONST.UNACKED_WARNING], false);
}
set
{
@@ -247,11 +239,12 @@ namespace Duplicati.Server.Database SaveSettings();
}
}
+
public bool ServerPortChanged
{
get
{
- return Duplicati.Library.Utility.Utility.ParseBoolOption(m_values, CONST.SERVER_PORT_CHANGED);
+ return Duplicati.Library.Utility.Utility.ParseBool(m_values[CONST.SERVER_PORT_CHANGED], false);
}
set
{
@@ -535,10 +528,7 @@ namespace Duplicati.Server.Database {
get
{
- if (m_values.ContainsKey(CONST.HAS_FIXED_INVALID_BACKUPID) && string.IsNullOrWhiteSpace(m_values[CONST.HAS_FIXED_INVALID_BACKUPID]))
- return false;
- else
- return Duplicati.Library.Utility.Utility.ParseBoolOption(m_values, CONST.HAS_FIXED_INVALID_BACKUPID);
+ return Duplicati.Library.Utility.Utility.ParseBool(m_values[CONST.HAS_FIXED_INVALID_BACKUPID], false);
}
set
{
|