From a96063e9aab41c153a13d5ce0f7dead672ff82f6 Mon Sep 17 00:00:00 2001 From: bitraid Date: Tue, 1 Jun 2021 18:57:54 +0300 Subject: Windows Uninstaller: Fix silent uninstall (again) (cherry picked from commit 74cf64a063a12a08e8979e2145b3cf0394bf2abd) --- misc/nsis/install_pages.nsh | 2 +- misc/nsis/qutebrowser.nsi | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/misc/nsis/install_pages.nsh b/misc/nsis/install_pages.nsh index a8e1f9253..c3cf973df 100755 --- a/misc/nsis/install_pages.nsh +++ b/misc/nsis/install_pages.nsh @@ -22,7 +22,7 @@ ; NsisMultiUser optional defines !define MULTIUSER_INSTALLMODE_ALLOW_BOTH_INSTALLATIONS 0 !define MULTIUSER_INSTALLMODE_ALLOW_ELEVATION 1 -!define MULTIUSER_INSTALLMODE_ALLOW_ELEVATION_IF_SILENT 0 +!define MULTIUSER_INSTALLMODE_ALLOW_ELEVATION_IF_SILENT 1 !define MULTIUSER_INSTALLMODE_DEFAULT_ALLUSERS 1 !if ${PLATFORM} == "win64" !define MULTIUSER_INSTALLMODE_64_BIT 1 diff --git a/misc/nsis/qutebrowser.nsi b/misc/nsis/qutebrowser.nsi index ccbc221cb..51f3b623d 100755 --- a/misc/nsis/qutebrowser.nsi +++ b/misc/nsis/qutebrowser.nsi @@ -146,8 +146,6 @@ ShowUninstDetails hide !packhdr "$%TEMP%\exehead.tmp" '"upx" "--ultra-brute" "$%TEMP%\exehead.tmp"' !endif -!define MULTIUSER_INSTALLMODE_ALLOW_ELEVATION_IF_SILENT 1 - ; Version Information VIFileVersion "${VERSION}.0" VIProductVersion "${VERSION}.0" -- cgit v1.2.3-54-g00ecf