Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-28 10:56:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

cargo fmt

Browse Source
This commit is contained in:
holger krekel
2019-10-07 00:15:15 +02:00
parent 51534b2fae
commit b8f211a013
4 changed files with 42 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
deltachat-ffi/src/lib.rs
View File

@@ -1620,9 +1620,7 @@ pub unsafe extern "C" fn dc_stop_ongoing_process(context: *mut dc_context_t) {
return; return;
} }
let ffi_context = &*context; let ffi_context = &*context;
ffi_context ffi_context.with_inner(|ctx| ctx.stop_ongoing()).ok();
.with_inner(|ctx| ctx.stop_ongoing())
.ok();
} }
#[no_mangle] #[no_mangle]

6
src/context.rs
View File

@@ -269,7 +269,11 @@ impl Context {
} }
pub fn shall_stop_ongoing(&self) -> bool { pub fn shall_stop_ongoing(&self) -> bool {
self.running_state.clone().read().unwrap().shall_stop_ongoing self.running_state
.clone()
.read()
.unwrap()
.shall_stop_ongoing
} }
/******************************************************************************* /*******************************************************************************

5
src/imex.rs
View File

@@ -598,7 +598,10 @@ fn add_files_to_export(context: &Context, dest_path_filename: &PathBuf) -> Resul
let mut processed_files_cnt = 0; let mut processed_files_cnt = 0;
for entry in dir_handle { for entry in dir_handle {
let entry = entry?; let entry = entry?;
ensure!(!context.shall_stop_ongoing(), "canceled during export-files"); ensure!(
!context.shall_stop_ongoing(),
"canceled during export-files"
);
processed_files_cnt += 1; processed_files_cnt += 1;
let permille = max(min(processed_files_cnt * 1000 / total_files_cnt, 990), 10); let permille = max(min(processed_files_cnt * 1000 / total_files_cnt, 990), 10);
context.call_cb(Event::ImexProgress(permille)); context.call_cb(Event::ImexProgress(permille));