From 96a82045d75b0f4eefcf1f668b305d8397c4f351 Mon Sep 17 00:00:00 2001 From: Michael Aaron Murphy Date: Mon, 13 Jul 2026 20:06:45 +0200 Subject: [PATCH] fix(segmented_button): crash when enumerating context menu buttons --- src/widget/segmented_button/widget.rs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/widget/segmented_button/widget.rs b/src/widget/segmented_button/widget.rs index ce5a6f21..fbefce34 100644 --- a/src/widget/segmented_button/widget.rs +++ b/src/widget/segmented_button/widget.rs @@ -970,11 +970,12 @@ where let Some((mut bounds, i)) = self .variant_bounds(state, layout.bounds()) - .enumerate() - .find_map(|(i, item)| match item { - ItemBounds::Button(e, bounds) if e == entity => Some((bounds, i)), + .filter_map(|item| match item { + ItemBounds::Button(entity, bounds) => Some((bounds, entity)), _ => None, }) + .enumerate() + .find_map(|(i, (bounds, e))| if e == entity { Some((bounds, i)) } else { None }) else { return; }; @@ -2529,11 +2530,12 @@ where let (mut bounds, i) = self .variant_bounds(state, layout.bounds()) - .enumerate() - .find_map(|(i, item)| match item { - ItemBounds::Button(e, bounds) if e == entity => Some((bounds, i)), + .filter_map(|item| match item { + ItemBounds::Button(entity, bounds) => Some((bounds, entity)), _ => None, - })?; + }) + .enumerate() + .find_map(|(i, (bounds, e))| if e == entity { Some((bounds, i)) } else { None })?; assert!( self.context_menu