From cfb2a382b10baacb20e0ba00cd86fc970c457a81 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Fri, 30 Apr 2021 19:07:30 +1000 Subject: [PATCH] empty/restore media trash shouldn't clear undo --- rslib/src/backend/media.rs | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/rslib/src/backend/media.rs b/rslib/src/backend/media.rs index 306c96b40..22ba734ce 100644 --- a/rslib/src/backend/media.rs +++ b/rslib/src/backend/media.rs @@ -62,11 +62,8 @@ impl MediaService for Backend { self.with_col(|col| { let mgr = MediaManager::new(&col.media_folder, &col.media_db)?; - col.transact_no_undo(|ctx| { - let mut checker = MediaChecker::new(ctx, &mgr, progress_fn); - - checker.empty_trash() - }) + let mut checker = MediaChecker::new(col, &mgr, progress_fn); + checker.empty_trash() }) .map(Into::into) } @@ -77,12 +74,8 @@ impl MediaService for Backend { move |progress| handler.update(Progress::MediaCheck(progress as u32), true); self.with_col(|col| { let mgr = MediaManager::new(&col.media_folder, &col.media_db)?; - - col.transact_no_undo(|ctx| { - let mut checker = MediaChecker::new(ctx, &mgr, progress_fn); - - checker.restore_trash() - }) + let mut checker = MediaChecker::new(col, &mgr, progress_fn); + checker.restore_trash() }) .map(Into::into) }