mmo-ref/drop-app-archived
1
0
Fork 0
mirror of https://github.com/Drop-OSS/drop-app synced 2026-08-27 22:23:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore(downloads): Progress on terminator

Browse source
This commit is contained in:
quexeky 2025-01-16 18:57:37 +11:00
parent 0381b8b8cb
commit 5f5cbd07c6
No known key found for this signature in database
GPG key ID: 7A067DADABACB6F2
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src-tauri/src/download_manager/download_manager.rs
View file

@ -83,7 +83,7 @@ pub enum DownloadStatus {
/// which provides raw access to the underlying queue.
/// THIS EDITING IS BLOCKING!!!
pub struct DownloadManager {
terminator: Mutex<JoinHandle<Result<(), ()>>>,
terminator: Mutex<Option<JoinHandle<Result<(), ()>>>>,
download_queue: Queue,
progress: CurrentProgressObject,
command_sender: Sender<DownloadManagerSignal>,
@ -98,7 +98,7 @@ impl DownloadManager {
command_sender: Sender<DownloadManagerSignal>,
) -> Self {
Self {
terminator,
terminator: Mutex::new(Some(terminator)),
download_queue,
progress,
command_sender,
@ -177,7 +177,8 @@ impl DownloadManager {
self.command_sender
.send(DownloadManagerSignal::Finish)
.unwrap();
self.terminator.join()
let terminator = self.terminator.lock().unwrap().take();
terminator.unwrap().join()
}
pub fn uninstall_application(&self, meta: DownloadableMetadata) {
self.command_sender