fix #1713

BeyondDimension · Jul 23, 2022 · 6b299e6 · 6b299e6
1 parent 85a04f3
commit 6b299e6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainWindow.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainWindow.axaml.cs
@@ -35,7 +35,6 @@ void IApplicationSplashScreen.RunTasks()
         {
             if (IApplication.IsDesktopPlatform)
             {
-                IViewModelManager.Instance.MainWindow?.Initialize();
                 AdvertiseService.Current.InitAdvertise();
             }
         }

diff --git a/src/Startup.cs b/src/Startup.cs
@@ -649,6 +649,7 @@ static void OnCreateAppExecuted(IApplication.IProgramHost host, Action<IViewMode
                 vmService.InitViewModels();
                 if (isTrace) StartWatchTrace.Record("VM.Init");
                 handlerViewModelManager?.Invoke(vmService);
+                vmService.MainWindow?.Initialize();
                 if (isTrace) StartWatchTrace.Record("VM.Delegate");
             }
             finally
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,6 @@ void IApplicationSplashScreen.RunTasks() @@
             {
                 if (IApplication.IsDesktopPlatform)
                 {
-                    IViewModelManager.Instance.MainWindow?.Initialize();
                     AdvertiseService.Current.InitAdvertise();
                 }
             }
@@ Expand Down @@