Register the hotkey after PT Run is initialized (#11858)

microsoft · Jun 24, 2021 · d7e09e8 · d7e09e8
1 parent 0f32e99
commit d7e09e8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/modules/launcher/PowerLauncher/App.xaml.cs b/src/modules/launcher/PowerLauncher/App.xaml.cs
@@ -138,6 +138,7 @@ private void OnStartup(object sender, StartupEventArgs e)
                 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
@@ -74,8 +74,12 @@ public MainViewModel(PowerToysRunSettings settings)
 
             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;