From 4c085732e8cb3307b860efd403c9f9e85d948bb4 Mon Sep 17 00:00:00 2001 From: Ride_A_Pig <1124309165@qq.com> Date: Mon, 26 May 2025 14:32:10 +0800 Subject: [PATCH 1/2] Fix the filepicker replacing other files without warning --- src/bin/edit/draw_filepicker.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/bin/edit/draw_filepicker.rs b/src/bin/edit/draw_filepicker.rs index d5b8ebb4ee7..d77e0d214d8 100644 --- a/src/bin/edit/draw_filepicker.rs +++ b/src/bin/edit/draw_filepicker.rs @@ -114,9 +114,7 @@ pub fn draw_file_picker(ctx: &mut Context, state: &mut State) { // Check if the file already exists and show an overwrite warning in that case. if state.wants_file_picker != StateFilePicker::Open && let Some(path) = doit.as_deref() - && let Some(doc) = state.documents.active() - && let Some(file_id) = &doc.file_id - && sys::file_id(None, path).is_ok_and(|id| &id == file_id) + && std::fs::exists(path).unwrap() { state.file_picker_overwrite_warning = doit.take(); } From 4c7ab00885ff4fe668576772b75d48b4ebbc8fdc Mon Sep 17 00:00:00 2001 From: Ride_A_Pig <1124309165@qq.com> Date: Mon, 26 May 2025 14:35:48 +0800 Subject: [PATCH 2/2] Fix the filepicker replacing files without warning --- src/bin/edit/draw_filepicker.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/edit/draw_filepicker.rs b/src/bin/edit/draw_filepicker.rs index d77e0d214d8..42988fc3b18 100644 --- a/src/bin/edit/draw_filepicker.rs +++ b/src/bin/edit/draw_filepicker.rs @@ -9,7 +9,7 @@ use edit::framebuffer::IndexedColor; use edit::helpers::*; use edit::input::vk; use edit::tui::*; -use edit::{icu, path, sys}; +use edit::{icu, path}; use crate::localization::*; use crate::state::*; @@ -114,7 +114,7 @@ pub fn draw_file_picker(ctx: &mut Context, state: &mut State) { // Check if the file already exists and show an overwrite warning in that case. if state.wants_file_picker != StateFilePicker::Open && let Some(path) = doit.as_deref() - && std::fs::exists(path).unwrap() + && path.exists() { state.file_picker_overwrite_warning = doit.take(); }