Merge master

2025-10-29 17:00:05 +00:00 · 2022-08-04 17:24:02 +08:00
parent 07debe8363
commit 3ff2f60fb7
27 changed files with 1015 additions and 281 deletions
--- a/src/ui/cm.rs
+++ b/src/ui/cm.rs
@@ -160,8 +160,8 @@ impl ConnectionManager {
                    id,
                    file_num,
                    mut files,
+                    overwrite_detection
                } => {
-                    let od = can_enable_overwrite_detection(get_version_number(VERSION));
                    // cm has no show_hidden context
                    // dummy remote, show_hidden, is_remote
                    write_jobs.push(fs::TransferJob::new_write(
@@ -179,7 +179,7 @@ impl ConnectionManager {
                                ..Default::default()
                            })
                            .collect(),
-                        od,
+                        overwrite_detection,
                    ));
                }
                ipc::FS::CancelWrite { id } => {