Skip to content

Commit 348ddaf

Browse files
Merge branch 'remove-redundant-relay-selector-updates'
2 parents 45e3b92 + 9cb1e06 commit 348ddaf

File tree

1 file changed

+2
-15
lines changed

1 file changed

+2
-15
lines changed

mullvad-daemon/src/custom_list.rs

+2-15
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,13 @@ where
2424
let new_list = CustomList::new(name);
2525
let id = new_list.id;
2626

27-
let settings_changed = self
28-
.settings
27+
self.settings
2928
.update(|settings| {
3029
settings.custom_lists.add(new_list);
3130
})
3231
.await
33-
.map_err(Error::SettingsError);
32+
.map_err(Error::SettingsError)?;
3433

35-
if let Ok(true) = settings_changed {
36-
self.event_listener
37-
.notify_settings(self.settings.to_settings());
38-
self.relay_selector
39-
.set_config(new_selector_config(&self.settings));
40-
}
41-
42-
settings_changed?;
4334
Ok(id)
4435
}
4536

@@ -63,8 +54,6 @@ where
6354
.map_err(Error::SettingsError);
6455

6556
if let Ok(true) = settings_changed {
66-
self.event_listener
67-
.notify_settings(self.settings.to_settings());
6857
self.relay_selector
6958
.set_config(new_selector_config(&self.settings));
7059

@@ -109,8 +98,6 @@ where
10998
.map_err(Error::SettingsError);
11099

111100
if let Ok(true) = settings_changed {
112-
self.event_listener
113-
.notify_settings(self.settings.to_settings());
114101
self.relay_selector
115102
.set_config(new_selector_config(&self.settings));
116103

0 commit comments

Comments
 (0)