Merge commit 'f50104be537d34fac7c2844d97d92115ed7e5999'

Mirroring · Mirroring · commit beaffa4b7fe3 · 2024-11-28T07:08:04.000Z
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/RadioButton.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/RadioButton.cs
@@ -161,7 +161,7 @@ private void UpdateRadioButtonGroup()
                         else
                         {
                             // Uncheck all checked RadioButtons different from the current one
-                            if (rb != this && (rb.IsChecked == true) && rootScope == KeyboardNavigation.GetVisualRoot(rb) && rootScope != null)
+                            if (rb != this && (rb.IsChecked == true) && rootScope == KeyboardNavigation.GetVisualRoot(rb))
                                 rb.UncheckRadioButton();
                             i++;
                         }

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ private void UpdateRadioButtonGroup()`
`161`	`161`	`else`
`162`	`162`	`{`
`163`	`163`	`// Uncheck all checked RadioButtons different from the current one`
`164`		`- if (rb != this && (rb.IsChecked == true) && rootScope == KeyboardNavigation.GetVisualRoot(rb) && rootScope != null)`
	`164`	`+ if (rb != this && (rb.IsChecked == true) && rootScope == KeyboardNavigation.GetVisualRoot(rb))`
`165`	`165`	`rb.UncheckRadioButton();`
`166`	`166`	`i++;`
`167`	`167`	`}`