From 04c92b05ee487fa11b9738fd81052316cef79ec3 Mon Sep 17 00:00:00 2001
From: Hongtao Zhang <hongtao_zhang@outlook.com>
Date: Wed, 15 Dec 2021 20:39:45 -0600
Subject: [PATCH] Delay till assign to Current.MainWindow

---
 Flow.Launcher/App.xaml.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index 1091f2f2f..d397856ad 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -78,12 +78,13 @@ namespace Flow.Launcher
                 await PluginManager.InitializePlugins(API);
                 var window = new MainWindow(_settings, _mainVM);
 
-                HotKeyMapper.Initialize(_mainVM);
 
                 Log.Info($"|App.OnStartup|Dependencies Info:{ErrorReporting.DependenciesInfo()}");
 
                 Current.MainWindow = window;
                 Current.MainWindow.Title = Constant.FlowLauncher;
+                
+                HotKeyMapper.Initialize(_mainVM);
 
                 // happlebao todo temp fix for instance code logic
                 // load plugin before change language, because plugin language also needs be changed