From 2aa6aabe1d221cd0d12852b8296a93c4326e3dba Mon Sep 17 00:00:00 2001 From: "seer-by-sentry[bot]" <157164994+seer-by-sentry[bot]@users.noreply.github.com> Date: Fri, 25 Jul 2025 02:13:11 +0000 Subject: [PATCH] Fix: Prevent exception when AppModel.LastSelectedTabIndex is set before MainPage is loaded --- src/Files.App/Data/Models/AppModel.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Files.App/Data/Models/AppModel.cs b/src/Files.App/Data/Models/AppModel.cs index 8b7e213ab34a..96a537e463e5 100644 --- a/src/Files.App/Data/Models/AppModel.cs +++ b/src/Files.App/Data/Models/AppModel.cs @@ -43,8 +43,10 @@ public int TabStripSelectedIndex if (value >= 0 && value < MainPageViewModel.AppInstances.Count) { var rootFrame = (Frame)MainWindow.Instance.Content; - var mainView = (MainPage)rootFrame.Content; - mainView.ViewModel.SelectedTabItem = MainPageViewModel.AppInstances[value]; + if (rootFrame.Content is MainPage mainView) + { + mainView.ViewModel.SelectedTabItem = MainPageViewModel.AppInstances[value]; + } } } catch (COMException)