From 8192348b51bc5cc7e34a34231501d660b6736666 Mon Sep 17 00:00:00 2001
From: Devdutt Shenoi <devdutt@bytebeam.io>
Date: Thu, 4 Apr 2024 23:01:19 +0530
Subject: [PATCH] fix: downloader shutdown leads to verification failure

---
 uplink/src/collector/downloader.rs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/uplink/src/collector/downloader.rs b/uplink/src/collector/downloader.rs
index 92188537..f1bb60fd 100644
--- a/uplink/src/collector/downloader.rs
+++ b/uplink/src/collector/downloader.rs
@@ -207,18 +207,19 @@ impl FileDownloader {
             }
         };
         select! {
-            // NOTE: if download has timedout don't do anything, else ensure errors are forwarded after three retries
-            o = timeout_at(deadline, self.continuous_retry(state)) => match o {
-                Ok(r) => r?,
-                Err(_) => error!("Last download has timedout"),
-            },
-
             _ = shutdown_rx.recv_async() => {
                 if let Err(e) = state.save(&self.config) {
                     error!("Error saving current_download: {e}");
                 }
-            }
 
+                return Ok(());
+            },
+
+            // NOTE: if download has timedout don't do anything, else ensure errors are forwarded after three retries
+            o = timeout_at(deadline, self.continuous_retry(state)) => match o {
+                Ok(r) => r?,
+                Err(_) => error!("Last download has timedout"),
+            }
         }
 
         state.current.meta.verify_checksum()?;