From 0fc69ca222adddded3d4f0a9e30ef77649f41f44 Mon Sep 17 00:00:00 2001
From: Stefan Markovic <57057282+stefansjfw@users.noreply.github.com>
Date: Wed, 2 Feb 2022 11:23:40 +0100
Subject: [PATCH] If process elevated and --dont-elevate arg - run non elevated
 (#15920)

---
 installer/PowerToysSetup/Product.wxs | 2 +-
 src/runner/main.cpp                  | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs
index d3fdde365e..1249d9e8dd 100644
--- a/installer/PowerToysSetup/Product.wxs
+++ b/installer/PowerToysSetup/Product.wxs
@@ -148,7 +148,7 @@
           Impersonate="yes"
           Return="asyncNoWait"
           FileKey="PowerToys.exe"
-          ExeCommand="" />
+          ExeCommand="--dont-elevate" />
 
         <CustomAction
           Id="TerminateProcesses"
diff --git a/src/runner/main.cpp b/src/runner/main.cpp
index 99b6560683..b673fd8fc4 100644
--- a/src/runner/main.cpp
+++ b/src/runner/main.cpp
@@ -386,7 +386,13 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
         apply_general_settings(general_settings, false);
         int rvalue = 0;
         const bool elevated = is_process_elevated();
-        if ((elevated ||
+
+        if (elevated && cmdLine.find("--dont-elevate") != std::string::npos &&
+            general_settings.GetNamedBoolean(L"run_elevated", false) == false) {
+            schedule_restart_as_non_elevated();
+            result = 0;
+        }
+        else if ((elevated ||
              general_settings.GetNamedBoolean(L"run_elevated", false) == false ||
              cmdLine.find("--dont-elevate") != std::string::npos))
         {