GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-19 06:22:22 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

empty/restore media trash shouldn't clear undo

Browse source
This commit is contained in:
Damien Elmes 2021-04-30 19:07:30 +10:00
parent 248373ef30
commit cfb2a382b1
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
rslib/src/backend/media.rs
View file

@ -62,12 +62,9 @@ impl MediaService for Backend {
self.with_col(|col| { self.with_col(|col| {
let mgr = MediaManager::new(&col.media_folder, &col.media_db)?; let mgr = MediaManager::new(&col.media_folder, &col.media_db)?;
col.transact_no_undo(|ctx| { let mut checker = MediaChecker::new(col, &mgr, progress_fn);
let mut checker = MediaChecker::new(ctx, &mgr, progress_fn);
checker.empty_trash() checker.empty_trash()
}) })
})
.map(Into::into) .map(Into::into)
} }
@ -77,13 +74,9 @@ impl MediaService for Backend {
move |progress| handler.update(Progress::MediaCheck(progress as u32), true); move |progress| handler.update(Progress::MediaCheck(progress as u32), true);
self.with_col(|col| { self.with_col(|col| {
let mgr = MediaManager::new(&col.media_folder, &col.media_db)?; let mgr = MediaManager::new(&col.media_folder, &col.media_db)?;
let mut checker = MediaChecker::new(col, &mgr, progress_fn);
col.transact_no_undo(|ctx| {
let mut checker = MediaChecker::new(ctx, &mgr, progress_fn);
checker.restore_trash() checker.restore_trash()
}) })
})
.map(Into::into) .map(Into::into)
} }
} }