Fix: Prevent null reference exception when hiding LayoutFlyout (#17546)

seer-by-sentry[bot] · web-flow · commit d065d236b8ce · 2025-09-04T23:27:44.000-04:00
Co-authored-by: seer-by-sentry[bot] &lt;157164994+seer-by-sentry[bot]@users.noreply.github.com&gt;
diff --git a/src/Files.App/UserControls/Toolbar.xaml.cs b/src/Files.App/UserControls/Toolbar.xaml.cs
@@ -112,7 +112,8 @@ private void AppBarButton_AccessKeyInvoked(UIElement sender, AccessKeyInvokedEve
 		private void LayoutButton_Click(object sender, RoutedEventArgs e)
 		{
 			// Hide flyout after choosing a layout
-			LayoutFlyout.Hide();
+			// Check if LayoutFlyout is not null to handle cases where UI elements are unloaded via x:Load
+			LayoutFlyout?.Hide();
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,8 @@ private void AppBarButton_AccessKeyInvoked(UIElement sender, AccessKeyInvokedEve`
`112`	`112`	`private void LayoutButton_Click(object sender, RoutedEventArgs e)`
`113`	`113`	`{`
`114`	`114`	`// Hide flyout after choosing a layout`
`115`		`- LayoutFlyout.Hide();`
	`115`	`+ // Check if LayoutFlyout is not null to handle cases where UI elements are unloaded via x:Load`
	`116`	`+ LayoutFlyout?.Hide();`
`116`	`117`	`}`
`117`	`118`	`}`
`118`	`119`	`}`