From 7e227097ef1264283572f6c1f5a3c31b34bea855 Mon Sep 17 00:00:00 2001 From: Sophie Herold Date: Mon, 5 Aug 2024 23:43:52 +0200 Subject: [PATCH] metadata: Merge memory_format correctly --- src/metadata.rs | 3 +++ src/widgets/image/background_color.rs | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/metadata.rs b/src/metadata.rs index 0634fed..3be7d87 100644 --- a/src/metadata.rs +++ b/src/metadata.rs @@ -110,6 +110,9 @@ impl Metadata { if self.frame_info.is_none() { self.frame_info = other.frame_info; } + if self.memory_format.is_none() { + self.memory_format = other.memory_format; + } } pub fn mime_type(&self) -> Option { diff --git a/src/widgets/image/background_color.rs b/src/widgets/image/background_color.rs index e54585d..680cc6d 100644 --- a/src/widgets/image/background_color.rs +++ b/src/widgets/image/background_color.rs @@ -58,6 +58,8 @@ impl imp::LpImage { pub async fn background_color_guess(&self) -> Option { let obj = self.obj(); + log::debug!("Determining background color"); + if self.fixed_background_color.borrow().is_some() { return None; }