diff options
| -rw-r--r-- | mullvad-daemon/src/settings.rs | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/mullvad-daemon/src/settings.rs b/mullvad-daemon/src/settings.rs index 530bf90205..490c7db849 100644 --- a/mullvad-daemon/src/settings.rs +++ b/mullvad-daemon/src/settings.rs @@ -30,14 +30,8 @@ pub struct SettingsPersister { impl SettingsPersister { pub fn load() -> Self { - let settings = match Self::load_settings_from_file() { - Ok(mut settings) => { - // Force IPv6 to be enabled on Android - if cfg!(target_os = "android") { - let _ = settings.set_enable_ipv6(true); - } - settings - } + let mut settings = match Self::load_settings_from_file() { + Ok(settings) => settings, #[cfg(windows)] Err(LoadSettingsError::FileNotFound) => { if Self::migrate_after_windows_update() { @@ -62,6 +56,11 @@ impl SettingsPersister { } }; + // Force IPv6 to be enabled on Android + if cfg!(target_os = "android") { + let _ = settings.set_enable_ipv6(true); + } + SettingsPersister { settings } } |