From d7e09e83c27f8c6f64d149a78a864a8845dd593e Mon Sep 17 00:00:00 2001
From: Mykhailo Pylyp <pylypsmol@gmail.com>
Date: Thu, 24 Jun 2021 17:50:34 +0300
Subject: [PATCH] Register the hotkey after PT Run is initialized (#11858)

---
 src/modules/launcher/PowerLauncher/App.xaml.cs              | 1 +
 .../launcher/PowerLauncher/ViewModel/MainViewModel.cs       | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/modules/launcher/PowerLauncher/App.xaml.cs b/src/modules/launcher/PowerLauncher/App.xaml.cs
index bdeac9a6aa..2fb7276a92 100644
--- a/src/modules/launcher/PowerLauncher/App.xaml.cs
+++ b/src/modules/launcher/PowerLauncher/App.xaml.cs
@@ -138,6 +138,7 @@ namespace PowerLauncher
                 bootTime.Stop();
 
                 Log.Info(textToLog.ToString(), GetType());
+                _mainVM.RegisterHotkey();
                 PowerToysTelemetry.Log.WriteEvent(new LauncherBootEvent() { BootTimeMs = bootTime.ElapsedMilliseconds });
 
                 // [Conditional("RELEASE")]
diff --git a/src/modules/launcher/PowerLauncher/ViewModel/MainViewModel.cs b/src/modules/launcher/PowerLauncher/ViewModel/MainViewModel.cs
index 20a53239c2..3920f6fd55 100644
--- a/src/modules/launcher/PowerLauncher/ViewModel/MainViewModel.cs
+++ b/src/modules/launcher/PowerLauncher/ViewModel/MainViewModel.cs
@@ -74,8 +74,12 @@ namespace PowerLauncher.ViewModel
 
             InitializeKeyCommands();
             RegisterResultsUpdatedEvent();
+        }
 
-            if (settings != null && settings.UsePowerToysRunnerKeyboardHook)
+        public void RegisterHotkey()
+        {
+            Log.Info("RegisterHotkey()", GetType());
+            if (_settings != null && _settings.UsePowerToysRunnerKeyboardHook)
             {
                 NativeEventWaiter.WaitForEventLoop(Constants.PowerLauncherSharedEvent(), OnHotkey);
                 _hotkeyHandle = 0;