Fix Runner stealing shortcuts on older Win10 (#9744)

microsoft · Feb 17, 2021 · ee45c39 · ee45c39
1 parent 666b4e5
commit ee45c39
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/modules/launcher/Microsoft.Launcher/dllmain.cpp b/src/modules/launcher/Microsoft.Launcher/dllmain.cpp
@@ -202,9 +202,16 @@ class Microsoft_Launcher : public PowertoyModuleIface
                 sei.lpFile = L"modules\\launcher\\PowerLauncher.exe";
                 sei.nShow = SW_SHOWNORMAL;
                 sei.lpParameters = executable_args.data();
-                ShellExecuteExW(&sei);
-
-                m_hProcess = sei.hProcess;
+
+                if (ShellExecuteExW(&sei))
+                {
+                    m_enabled = true;
+                    m_hProcess = sei.hProcess;
+                }
+                else
+                {
+                    Logger::error("Launcher failed to start");
+                }
             }
             else
             {
@@ -231,6 +238,7 @@ class Microsoft_Launcher : public PowertoyModuleIface
 
                         if (run_non_elevated(action_runner_path, params, pidBuffer))
                         {
+                            m_enabled = true;
                             const int maxRetries = 80;
                             for (int retry = 0; retry < maxRetries; ++retry)
                             {
@@ -248,8 +256,6 @@ class Microsoft_Launcher : public PowertoyModuleIface
                 }
             }
         }
-
-        m_enabled = true;
     }
 
     // Disable the powertoy