diff options
| author | David Lönnhager <david.l@mullvad.net> | 2024-04-17 22:12:38 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2024-04-23 15:31:47 +0200 |
| commit | 0329c9e1c813da258f09d435809f3c7ce0f6293f (patch) | |
| tree | c94a6f917eed685e0177ae7a2b5cc3e89e7ad744 | |
| parent | f3763e91974831202bfc94b74c9335870be16dda (diff) | |
| download | mullvadvpn-0329c9e1c813da258f09d435809f3c7ce0f6293f.tar.xz mullvadvpn-0329c9e1c813da258f09d435809f3c7ce0f6293f.zip | |
Remove some pointless checks
| -rw-r--r-- | mullvad-daemon/src/version_check.rs | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/mullvad-daemon/src/version_check.rs b/mullvad-daemon/src/version_check.rs index a53424324d..91d34074d2 100644 --- a/mullvad-daemon/src/version_check.rs +++ b/mullvad-daemon/src/version_check.rs @@ -336,10 +336,7 @@ impl VersionUpdater { /// /// [rvc]: VersionUpdaterCommand::GetVersionInfo async fn update_version_info(&mut self, new_version_info: AppVersionInfo) { - // if daemon can't be reached, return immediately - if self.update_sender.send(new_version_info.clone()).is_err() { - return; - } + let _ = self.update_sender.send(new_version_info.clone()); self.last_app_version_info = Some((new_version_info, SystemTime::now())); if let Err(err) = self.write_cache().await { @@ -429,9 +426,6 @@ impl VersionUpdater { } Some(VersionUpdaterCommand::GetVersionInfo(done_tx)) => { - if self.update_sender.is_closed() { - return; - } match (self.version_is_stale(), self.last_app_version_info()) { (false, Some(version_info)) => { // if the version_info isn't stale, return it immediately. @@ -450,14 +444,11 @@ impl VersionUpdater { // time to shut down None => { - return; + break; } }, _ = version_is_stale => { - if rx.is_terminated() || self.update_sender.is_closed() { - return; - } if self.is_running_version_check() { continue; } @@ -465,10 +456,6 @@ impl VersionUpdater { }, response = version_check => { - if rx.is_terminated() || self.update_sender.is_closed() { - return; - } - match response { Ok(version_info_response) => { let new_version_info = |