Fix: Prevent exception when setting SelectedTabIndex before MainPage is loaded (#17388)

seer-by-sentry[bot] · web-flow · commit c7687ab0ade0 · 2025-07-31T22:56:19.000-04:00
diff --git a/src/Files.App/Data/Models/AppModel.cs b/src/Files.App/Data/Models/AppModel.cs
@@ -42,11 +42,8 @@ public int TabStripSelectedIndex
 				{
 					if (value >= 0 && value < MainPageViewModel.AppInstances.Count)
 					{
-						var rootFrame = (Frame)MainWindow.Instance.Content;
-						if (rootFrame.Content is MainPage mainView)
-						{
+						if (MainWindow.Instance.Content is Frame rootFrame && rootFrame.Content is MainPage mainView)
 							mainView.ViewModel.SelectedTabItem = MainPageViewModel.AppInstances[value];
-						}
 					}
 				}
 				catch (COMException)

Original file line number	Diff line number	Diff line change
`@@ -42,11 +42,8 @@ public int TabStripSelectedIndex`
`42`	`42`	`{`
`43`	`43`	`if (value >= 0 && value < MainPageViewModel.AppInstances.Count)`
`44`	`44`	`{`
`45`		`- var rootFrame = (Frame)MainWindow.Instance.Content;`
`46`		`- if (rootFrame.Content is MainPage mainView)`
`47`		`- {`
	`45`	`+ if (MainWindow.Instance.Content is Frame rootFrame && rootFrame.Content is MainPage mainView)`
`48`	`46`	`mainView.ViewModel.SelectedTabItem = MainPageViewModel.AppInstances[value];`
`49`		`- }`
`50`	`47`	`}`
`51`	`48`	`}`
`52`	`49`	`catch (COMException)`