From e3c239f5ae731db1c1a6af9e46def7f77d5fd95e Mon Sep 17 00:00:00 2001 From: Kingtous Date: Tue, 6 Dec 2022 15:09:57 +0800 Subject: [PATCH] fix: write job resets --- src/client/io_loop.rs | 8 +++----- src/ui_cm_interface.rs | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/client/io_loop.rs b/src/client/io_loop.rs index 5adca6d81..efeacb61c 100644 --- a/src/client/io_loop.rs +++ b/src/client/io_loop.rs @@ -933,14 +933,12 @@ impl Remote { err = job.job_error(); fs::remove_job(d.id, &mut self.write_jobs); } - if let Some(job) = fs::get_job(d.id, &mut self.read_jobs) { - job.modify_time(); - err = job.job_error(); - fs::remove_job(d.id, &mut self.read_jobs); - } self.handle_job_status(d.id, d.file_num, err); } Some(file_response::Union::Error(e)) => { + if let Some(job) = fs::get_job(e.id, &mut self.write_jobs) { + fs::remove_job(e.id, &mut self.write_jobs); + } self.handle_job_status(e.id, e.file_num, Some(e.error)); } _ => {} diff --git a/src/ui_cm_interface.rs b/src/ui_cm_interface.rs index 97ae82b8b..695d60417 100644 --- a/src/ui_cm_interface.rs +++ b/src/ui_cm_interface.rs @@ -598,8 +598,8 @@ async fn handle_fs(fs: ipc::FS, write_jobs: &mut Vec, tx: &Unbo } ipc::FS::WriteError { id, file_num, err } => { if let Some(job) = fs::get_job(id, write_jobs) { - send_raw(fs::new_error(id, err, file_num), tx); - fs::remove_job(id, write_jobs); + send_raw(fs::new_error(job.id(), err, file_num), tx); + fs::remove_job(job.id(), write_jobs); } } ipc::FS::WriteBlock {