Ehh

Author: qarmin

czkawka_core/src/tools/bad_extensions/core.rs

@@ -70,7 +70,7 @@ impl BadExtensions {
         progress_handler.join_thread();
 
         // Break if stop was clicked
-        if stop_flag.load(Ordering::Relaxed) {
+        if check_if_stop_received(stop_flag) {
             return WorkContinueStatus::Stop;
         }
 

czkawka_core/src/tools/same_music/core.rs

@@ -311,7 +311,7 @@ impl SameMusic {
         // Break if stop was clicked after saving to cache
 
         progress_handler.join_thread();
-        if stop_flag.load(Ordering::Relaxed) {
+        if check_if_stop_received(stop_flag) {
             return WorkContinueStatus::Stop;
         }
 

czkawka_core/src/tools/similar_images/core.rs

@@ -1,7 +1,7 @@
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
-use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::atomic::AtomicBool;
 use std::{mem, panic};
 
 use bk_tree::BKTree;
@@ -209,7 +209,7 @@ impl SimilarImages {
         self.save_to_cache(vec_file_entry, loaded_hash_map);
 
         // Break if stop was clicked after saving to cache
-        if stop_flag.load(Ordering::Relaxed) {
+        if check_if_stop_received(stop_flag) {
             return WorkContinueStatus::Stop;
         }
 
@@ -386,7 +386,7 @@ impl SimilarImages {
             //     println!("{hash:?} --- {:?}", vec.iter().map(|e| e.1).collect::<Vec<_>>());
             // }
 
-            if stop_flag.load(Ordering::Relaxed) {
+            if check_if_stop_received(stop_flag) {
                 progress_handler.join_thread();
                 return WorkContinueStatus::Stop;
             }

czkawka_core/src/tools/similar_videos/core.rs

@@ -1,7 +1,7 @@
 use std::collections::{BTreeMap, BTreeSet, HashMap};
 use std::mem;
 use std::sync::Arc;
-use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::atomic::AtomicBool;
 
 use crossbeam_channel::Sender;
 use fun_time::fun_time;
@@ -191,7 +191,7 @@ impl SimilarVideos {
         self.save_cache(vec_file_entry, loaded_hash_map);
 
         // Break if stop was clicked after saving to cache
-        if stop_flag.load(Ordering::Relaxed) {
+        if check_if_stop_received(stop_flag) {
             return WorkContinueStatus::Stop;
         }