fix-31727-Made changes to fix race condition logic.

BagavathiPerumal · PureWeen · commit fccff416af31 · 2026-01-08T14:49:36.000Z
diff --git a/src/Controls/src/Core/Platform/Android/Extensions/ToolbarExtensions.cs b/src/Controls/src/Core/Platform/Android/Extensions/ToolbarExtensions.cs
@@ -385,11 +385,13 @@ internal static void UpdateMenuItemIcon(this IMauiContext mauiContext, IMenuItem
 					return;
 				}
 
-				if (_menuItemToolbarItemMap.TryGetValue(menuItem.ItemId, out var weakRef) && 
-				    weakRef.TryGetTarget(out var currentToolbarItem) && 
-				    !ReferenceEquals(currentToolbarItem, toolBarItem))
+				if (_menuItemToolbarItemMap.TryGetValue(menuItem.ItemId, out var weakRef))
 				{
-					return;
+					// If the target was garbage collected or is a different ToolbarItem, abort
+					if (!weakRef.TryGetTarget(out var currentToolbarItem) || !ReferenceEquals(currentToolbarItem, toolBarItem))
+					{
+						return;
+					}
 				}
 
 				if (baseDrawable != null)

Original file line number	Diff line number	Diff line change
`@@ -385,11 +385,13 @@ internal static void UpdateMenuItemIcon(this IMauiContext mauiContext, IMenuItem`
`385`	`385`	`return;`
`386`	`386`	`}`
`387`	`387`
`388`		`- if (_menuItemToolbarItemMap.TryGetValue(menuItem.ItemId, out var weakRef) &&`
`389`		`- weakRef.TryGetTarget(out var currentToolbarItem) &&`
`390`		`- !ReferenceEquals(currentToolbarItem, toolBarItem))`
	`388`	`+ if (_menuItemToolbarItemMap.TryGetValue(menuItem.ItemId, out var weakRef))`
`391`	`389`	`{`
`392`		`- return;`
	`390`	`+ // If the target was garbage collected or is a different ToolbarItem, abort`
	`391`	`+ if (!weakRef.TryGetTarget(out var currentToolbarItem) \|\| !ReferenceEquals(currentToolbarItem, toolBarItem))`
	`392`	`+ {`
	`393`	`+ return;`
	`394`	`+ }`
`393`	`395`	`}`
`394`	`396`
`395`	`397`	`if (baseDrawable != null)`