Create an explicit DEFAULT_SETTINGS instance

1 files changed, 4 insertions, 2 deletions

diff --git a/mullvad-daemon/src/settings.rs b/mullvad-daemon/src/settings.rs
index 589f02c8e6..6aac3a5089 100644
--- a/mullvad-daemon/src/settings.rs
+++ b/mullvad-daemon/src/settings.rs
@@ -33,11 +33,13 @@ static APP_INFO: AppInfo = AppInfo {
 
 static SETTINGS_FILE: &str = "settings.toml";
 
-#[derive(Debug, Clone, Deserialize, Serialize, Default)]
+#[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct Settings {
     account_token: Option<String>,
 }
 
+const DEFAULT_SETTINGS: Settings = Settings { account_token: None };
+
 impl Settings {
     /// Loads user settings from file. If no file is present it returns the defaults.
     pub fn load() -> Result<Settings> {
@@ -52,7 +54,7 @@ impl Settings {
                     "No settings file at {}, using defaults",
                     settings_path.to_string_lossy()
                 );
-                Ok(Settings::default())
+                Ok(DEFAULT_SETTINGS)
             }
             Err(e) => Err(e).chain_err(|| ErrorKind::ReadError(settings_path)),
         }