From 6b299e63569d90079e8776cf0dc27a8bbe47d662 Mon Sep 17 00:00:00 2001
From: RMBGAME <rmb@rmbgame.net>
Date: Sat, 23 Jul 2022 21:34:45 +0800
Subject: [PATCH] fix #1713

---
 .../Application/UI/Views/MainWindow.axaml.cs                     | 1 -
 src/Startup.cs                                                   | 1 +
 2 files changed, 1 insertion(+), 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
index 39a7d3c32fd..50c40d540e1 100644
--- 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
index ca89c282e75..4998126afc8 100644
--- 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