From 1aeba3cbd0ae7b53ffd2c47f325864e3ec3b0210 Mon Sep 17 00:00:00 2001 From: pml68 Date: Mon, 31 Mar 2025 01:05:24 +0200 Subject: fix: merge conflict blobs [skip ci] --- src/main.rs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index 7728e63..63e9deb 100644 --- a/src/main.rs +++ b/src/main.rs @@ -174,15 +174,12 @@ impl App { self.editor_content.perform(action); } } - Message::RefreshEditorContent => { - match self.project.app_code(&self.config) { - Ok(code) => { - self.editor_content = - text_editor::Content::with_text(&code); - } - Err(error) => return error_dialog(error), + Message::RefreshEditorContent => match self.project.app_code() { + Ok(code) => { + self.editor_content = + text_editor::Content::with_text(&code); } - Err(error) => Task::future(error_dialog(error)).discard(), + Err(error) => return error_dialog(error), }, Message::DropNewElement(name, point, _) => { return iced_drop::zones_on_point( @@ -279,7 +276,7 @@ impl App { self.is_dirty = false; self.is_loading = true; return Task::perform( - Project::from_file(self.config.clone()), + Project::from_file(), Message::FileOpened, ) .chain(close_dialog_task); @@ -309,7 +306,7 @@ impl App { self.is_loading = true; return Task::perform( - Project::from_file(self.config.clone()), + Project::from_file(), Message::FileOpened, ); } else { -- cgit v1.2.3