runner: only launch update threads when we know we won't be elevated …

…and show windows for the child (#1537)
microsoft · Mar 12, 2020 · 20e89f2 · 20e89f2
1 parent bd2cf19
commit 20e89f2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/common/common.cpp b/src/common/common.cpp
@@ -442,6 +442,7 @@ bool run_elevated(const std::wstring& file, const std::wstring& params)
     exec_info.fMask = SEE_MASK_NOCLOSEPROCESS;
     exec_info.lpDirectory = 0;
     exec_info.hInstApp = 0;
+    exec_info.nShow = SW_SHOWDEFAULT;
 
     if (ShellExecuteExW(&exec_info))
     {

diff --git a/src/runner/main.cpp b/src/runner/main.cpp
@@ -167,6 +167,17 @@ int runner(bool isProcessElevated)
     int result = -1;
     try
     {
+        std::thread{ [] {
+            github_update_checking_worker();
+        } }.detach();
+
+        if (winstore::running_as_packaged())
+        {
+            std::thread{ [] {
+                start_msi_uninstallation_sequence();
+            } }.detach();
+        }
+
         notifications::register_background_toast_handler();
 
         chdir_current_executable();
@@ -318,17 +329,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
     int result = 0;
     try
     {
-        std::thread{ [] {
-            github_update_checking_worker();
-        } }.detach();
-
-        if (winstore::running_as_packaged())
-        {
-            std::thread{ [] {
-                start_msi_uninstallation_sequence();
-            } }.detach();
-        }
-
         // Singletons initialization order needs to be preserved, first events and
         // then modules to guarantee the reverse destruction order.
         SystemMenuHelperInstace();