summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMarkus Pettersson <markus.pettersson@mullvad.net>2024-02-20 10:00:17 +0100
committerMarkus Pettersson <markus.pettersson@mullvad.net>2024-02-20 10:00:17 +0100
commit348ddaf3ae7a59efa90fbb07360016d48793f290 (patch)
tree0553e6685ab5b9833a05bcbf8a6fcfcde48dbd59
parent45e3b9203d6a6ca6c112bdec65387564a4c50806 (diff)
parent9cb1e06c370f7c8164c94ffa6b157c41c66cd731 (diff)
downloadmullvadvpn-348ddaf3ae7a59efa90fbb07360016d48793f290.tar.xz
mullvadvpn-348ddaf3ae7a59efa90fbb07360016d48793f290.zip
Merge branch 'remove-redundant-relay-selector-updates'
-rw-r--r--mullvad-daemon/src/custom_list.rs17
1 files changed, 2 insertions, 15 deletions
diff --git a/mullvad-daemon/src/custom_list.rs b/mullvad-daemon/src/custom_list.rs
index ce41b0059b..8a9573fcb0 100644
--- a/mullvad-daemon/src/custom_list.rs
+++ b/mullvad-daemon/src/custom_list.rs
@@ -24,22 +24,13 @@ where
let new_list = CustomList::new(name);
let id = new_list.id;
- let settings_changed = self
- .settings
+ self.settings
.update(|settings| {
settings.custom_lists.add(new_list);
})
.await
- .map_err(Error::SettingsError);
+ .map_err(Error::SettingsError)?;
- if let Ok(true) = settings_changed {
- self.event_listener
- .notify_settings(self.settings.to_settings());
- self.relay_selector
- .set_config(new_selector_config(&self.settings));
- }
-
- settings_changed?;
Ok(id)
}
@@ -63,8 +54,6 @@ where
.map_err(Error::SettingsError);
if let Ok(true) = settings_changed {
- self.event_listener
- .notify_settings(self.settings.to_settings());
self.relay_selector
.set_config(new_selector_config(&self.settings));
@@ -109,8 +98,6 @@ where
.map_err(Error::SettingsError);
if let Ok(true) = settings_changed {
- self.event_listener
- .notify_settings(self.settings.to_settings());
self.relay_selector
.set_config(new_selector_config(&self.settings));