Fix component initialization issue

Jack251970 · Jack251970 · commit 1a67c8906b42 · 2025-05-15T19:36:45.000+08:00
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs
@@ -14,10 +14,14 @@ public partial class WelcomePage1
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
+            // If the navigation is not triggered by button click, view model will be null again
             if (_viewModel == null)
             {
                 Settings = Ioc.Default.GetRequiredService<Settings>();
                 _viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();
+            }
+            if (!IsInitialized)
+            {
                 InitializeComponent();
             }
             // Sometimes the navigation is not triggered by button click,
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs
@@ -16,10 +16,14 @@ public partial class WelcomePage2
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
+            // If the navigation is not triggered by button click, view model will be null again
             if (_viewModel == null)
             {
                 Settings = Ioc.Default.GetRequiredService<Settings>();
                 _viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();
+            }
+            if (!IsInitialized)
+            {
                 InitializeComponent();
             }
             // Sometimes the navigation is not triggered by button click,
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs
@@ -12,10 +12,14 @@ public partial class WelcomePage3
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
+            // If the navigation is not triggered by button click, view model will be null again
             if (_viewModel == null)
             {
                 Settings = Ioc.Default.GetRequiredService<Settings>();
                 _viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();
+            }
+            if (!IsInitialized)
+            {
                 InitializeComponent();
             }
             // Sometimes the navigation is not triggered by button click,
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs
@@ -12,10 +12,14 @@ public partial class WelcomePage4
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
+            // If the navigation is not triggered by button click, view model will be null again
             if (_viewModel == null)
             {
                 Settings = Ioc.Default.GetRequiredService<Settings>();
                 _viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();
+            }
+            if (!IsInitialized)
+            {
                 InitializeComponent();
             }
             // Sometimes the navigation is not triggered by button click,
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs
@@ -15,10 +15,14 @@ public partial class WelcomePage5
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
+            // If the navigation is not triggered by button click, view model will be null again
             if (_viewModel == null)
             {
                 Settings = Ioc.Default.GetRequiredService<Settings>();
                 _viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();
+            }
+            if (!IsInitialized)
+            {
                 InitializeComponent();
             }
             // Sometimes the navigation is not triggered by button click,
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml.cs
@@ -12,11 +12,15 @@ public partial class SettingsPaneAbout
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
+        // If the navigation is not triggered by button click, view model will be null again
         if (_viewModel == null)
         {
             _viewModel = Ioc.Default.GetRequiredService<SettingsPaneAboutViewModel>();
             _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
             DataContext = _viewModel;
+        }
+        if (!IsInitialized)
+        {
             InitializeComponent();
         }
         // Sometimes the navigation is not triggered by button click,
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml.cs
@@ -12,11 +12,15 @@ public partial class SettingsPaneGeneral
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
+        // If the navigation is not triggered by button click, view model will be null again
         if (_viewModel == null)
         {
             _viewModel = Ioc.Default.GetRequiredService<SettingsPaneGeneralViewModel>();
             _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
             DataContext = _viewModel;
+        }
+        if (!IsInitialized)
+        {
             InitializeComponent();
         }
         // Sometimes the navigation is not triggered by button click,
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs
@@ -12,11 +12,15 @@ public partial class SettingsPaneHotkey
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
+        // If the navigation is not triggered by button click, view model will be null again
         if (_viewModel == null)
         {
             _viewModel = Ioc.Default.GetRequiredService<SettingsPaneHotkeyViewModel>();
             _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
             DataContext = _viewModel;
+        }
+        if (!IsInitialized)
+        {
             InitializeComponent();
         }
         // Sometimes the navigation is not triggered by button click,
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs
@@ -15,11 +15,15 @@ public partial class SettingsPanePluginStore
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
+        // If the navigation is not triggered by button click, view model will be null again
         if (_viewModel == null)
         {
             _viewModel = Ioc.Default.GetRequiredService<SettingsPanePluginStoreViewModel>();
             _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
             DataContext = _viewModel;
+        }
+        if (!IsInitialized)
+        {
             InitializeComponent();
         }
         _viewModel.PropertyChanged += ViewModel_PropertyChanged;
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml.cs
@@ -15,11 +15,15 @@ public partial class SettingsPanePlugins
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
+        // If the navigation is not triggered by button click, view model will be null again
         if (_viewModel == null)
         {
             _viewModel = Ioc.Default.GetRequiredService<SettingsPanePluginsViewModel>();
             _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
             DataContext = _viewModel;
+        }
+        if (!IsInitialized)
+        {
             InitializeComponent();
         }
         _viewModel.PropertyChanged += ViewModel_PropertyChanged;
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml.cs
@@ -12,11 +12,15 @@ public partial class SettingsPaneProxy
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
+        // If the navigation is not triggered by button click, view model will be null again
         if (_viewModel == null)
         {
             _viewModel = Ioc.Default.GetRequiredService<SettingsPaneProxyViewModel>();
             _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
             DataContext = _viewModel;
+        }
+        if (!IsInitialized)
+        {
             InitializeComponent();
         }
         // Sometimes the navigation is not triggered by button click,
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs
@@ -12,11 +12,15 @@ public partial class SettingsPaneTheme
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
+        // If the navigation is not triggered by button click, view model will be null again
         if (_viewModel == null)
         {
             _viewModel = Ioc.Default.GetRequiredService<SettingsPaneThemeViewModel>();
             _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
             DataContext = _viewModel;
+        }
+        if (!IsInitialized)
+        {
             InitializeComponent();
         }
         // Sometimes the navigation is not triggered by button click,

Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,14 @@ public partial class WelcomePage1`
`14`	`14`
`15`	`15`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`16`	`16`	`{`
	`17`	`+ // If the navigation is not triggered by button click, view model will be null again`
`17`	`18`	`if (_viewModel == null)`
`18`	`19`	`{`
`19`	`20`	`Settings = Ioc.Default.GetRequiredService<Settings>();`
`20`	`21`	`_viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();`
	`22`	`+ }`
	`23`	`+ if (!IsInitialized)`
	`24`	`+ {`
`21`	`25`	`InitializeComponent();`
`22`	`26`	`}`
`23`	`27`	`// Sometimes the navigation is not triggered by button click,`
Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,14 @@ public partial class WelcomePage2`
`16`	`16`
`17`	`17`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`18`	`18`	`{`
	`19`	`+ // If the navigation is not triggered by button click, view model will be null again`
`19`	`20`	`if (_viewModel == null)`
`20`	`21`	`{`
`21`	`22`	`Settings = Ioc.Default.GetRequiredService<Settings>();`
`22`	`23`	`_viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();`
	`24`	`+ }`
	`25`	`+ if (!IsInitialized)`
	`26`	`+ {`
`23`	`27`	`InitializeComponent();`
`24`	`28`	`}`
`25`	`29`	`// Sometimes the navigation is not triggered by button click,`
Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,14 @@ public partial class WelcomePage3`
`12`	`12`
`13`	`13`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`14`	`14`	`{`
	`15`	`+ // If the navigation is not triggered by button click, view model will be null again`
`15`	`16`	`if (_viewModel == null)`
`16`	`17`	`{`
`17`	`18`	`Settings = Ioc.Default.GetRequiredService<Settings>();`
`18`	`19`	`_viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();`
	`20`	`+ }`
	`21`	`+ if (!IsInitialized)`
	`22`	`+ {`
`19`	`23`	`InitializeComponent();`
`20`	`24`	`}`
`21`	`25`	`// Sometimes the navigation is not triggered by button click,`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,14 @@ public partial class WelcomePage5`
`15`	`15`
`16`	`16`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`17`	`17`	`{`
	`18`	`+ // If the navigation is not triggered by button click, view model will be null again`
`18`	`19`	`if (_viewModel == null)`
`19`	`20`	`{`
`20`	`21`	`Settings = Ioc.Default.GetRequiredService<Settings>();`
`21`	`22`	`_viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();`
	`23`	`+ }`
	`24`	`+ if (!IsInitialized)`
	`25`	`+ {`
`22`	`26`	`InitializeComponent();`
`23`	`27`	`}`
`24`	`28`	`// Sometimes the navigation is not triggered by button click,`
Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,15 @@ public partial class SettingsPaneAbout`
`12`	`12`
`13`	`13`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`14`	`14`	`{`
	`15`	`+ // If the navigation is not triggered by button click, view model will be null again`
`15`	`16`	`if (_viewModel == null)`
`16`	`17`	`{`
`17`	`18`	`_viewModel = Ioc.Default.GetRequiredService<SettingsPaneAboutViewModel>();`
`18`	`19`	`_settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();`
`19`	`20`	`DataContext = _viewModel;`
	`21`	`+ }`
	`22`	`+ if (!IsInitialized)`
	`23`	`+ {`
`20`	`24`	`InitializeComponent();`
`21`	`25`	`}`
`22`	`26`	`// Sometimes the navigation is not triggered by button click,`
Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,15 @@ public partial class SettingsPanePluginStore`
`15`	`15`
`16`	`16`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`17`	`17`	`{`
	`18`	`+ // If the navigation is not triggered by button click, view model will be null again`
`18`	`19`	`if (_viewModel == null)`
`19`	`20`	`{`
`20`	`21`	`_viewModel = Ioc.Default.GetRequiredService<SettingsPanePluginStoreViewModel>();`
`21`	`22`	`_settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();`
`22`	`23`	`DataContext = _viewModel;`
	`24`	`+ }`
	`25`	`+ if (!IsInitialized)`
	`26`	`+ {`
`23`	`27`	`InitializeComponent();`
`24`	`28`	`}`
`25`	`29`	`_viewModel.PropertyChanged += ViewModel_PropertyChanged;`