lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

edit_window: Don't quit if close_request saving fails

Browse source 
Part-of: <https://gitlab.gnome.org/GNOME/loupe/-/merge_requests/576>
This commit is contained in:
Sophie Herold 2026-06-22 15:05:08 +02:00 • committed by Marge Bot
parent da60453335
commit ea449046b8
1 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/widgets/edit_window.rs
View file

@ -85,7 +85,9 @@ mod imp {
glib::spawn_future_local(glib::clone!( glib::spawn_future_local(glib::clone!(
#[weak] #[weak]
obj, obj,
async move { obj.imp().save_overwrite().await } async move {
let _ = obj.imp().save_overwrite().await;
}
)); ));
}); });
@ -244,7 +246,7 @@ mod imp {
} }
} }
pub(super) async fn save_overwrite(&self) { pub(super) async fn save_overwrite(&self) -> Result<(), ()> {
let obj = self.obj(); let obj = self.obj();
self.save.popdown(); self.save.popdown();
@ -269,9 +271,11 @@ mod imp {
old_cancellable.cancel(); old_cancellable.cancel();
} }
tracing::debug!("Saving changes …");
let written = self let written = self
.save(original_file.clone(), tmp_file.clone(), cancellable.clone()) .save(original_file.clone(), tmp_file.clone(), cancellable.clone())
.await; .await;
tracing::debug!("Image written: {written}");
if written { if written {
tracing::debug!("Moving image to trash '{}'", original_file.uri()); tracing::debug!("Moving image to trash '{}'", original_file.uri());
@ -284,14 +288,14 @@ mod imp {
if trash_result.is_err() { if trash_result.is_err() {
// Canceled // Canceled
tracing::debug!("Trashing image canceled"); tracing::debug!("Trashing image canceled");
return; return Err(());
} else if let Ok(Err(err)) = trash_result { } else if let Ok(Err(err)) = trash_result {
obj.window_show_error( obj.window_show_error(
&gettext("Failed to save image."), &gettext("Failed to save image."),
&format!("Failed to move image {current_path:?} to trash and therefore couldn't save image: {err}"), &format!("Failed to move image {current_path:?} to trash and therefore couldn't save image: {err}"),
ErrorType::General, ErrorType::General,
); );
return; return Err(());
} }
tracing::debug!("Moving '{}' to '{}'", tmp_file.uri(), original_file.uri()); tracing::debug!("Moving '{}' to '{}'", tmp_file.uri(), original_file.uri());
@ -310,7 +314,7 @@ mod imp {
if move_result.is_err() { if move_result.is_err() {
// Canceled // Canceled
tracing::debug!("Moving image canceled"); tracing::debug!("Moving image canceled");
return; return Err(());
} else if let Ok(Err(err)) = move_result { } else if let Ok(Err(err)) = move_result {
obj.window_show_error( obj.window_show_error(
&gettext("Failed to save image."), &gettext("Failed to save image."),
@ -319,12 +323,14 @@ mod imp {
), ),
ErrorType::General, ErrorType::General,
); );
return; return Err(());
} }
obj.window_inspect(|w| w.show_specific_image(original_file)); obj.window_inspect(|w| w.show_specific_image(original_file));
} }
} }
Ok(())
} }
#[must_use] #[must_use]
@ -527,8 +533,11 @@ impl LpEditWindow {
"close" => glib::Propagation::Stop, "close" => glib::Propagation::Stop,
"discard" => glib::Propagation::Proceed, "discard" => glib::Propagation::Proceed,
"save" => { "save" => {
self.imp().save_overwrite().await; if self.imp().save_overwrite().await.is_ok() {
glib::Propagation::Proceed glib::Propagation::Proceed
} else {
glib::Propagation::Stop
}
} }
res => { res => {
tracing::error!("Invalid dialog result: {res}"); tracing::error!("Invalid dialog result: {res}");