diff options
| author | Florian Bruhin <me@the-compiler.org> | 2021-06-01 18:01:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-01 18:01:47 +0200 |
| commit | 925a79ad4943aa1333b0e08847dd8b3bdf4f3a75 (patch) | |
| tree | d2bc54f9d38b0b796fedebd54f39240d62c7bd49 | |
| parent | 1d499b7d577fc04c892e195eebe84f7bbdfef88f (diff) | |
| parent | 74cf64a063a12a08e8979e2145b3cf0394bf2abd (diff) | |
| download | qutebrowser-925a79ad4943aa1333b0e08847dd8b3bdf4f3a75.tar.gz qutebrowser-925a79ad4943aa1333b0e08847dd8b3bdf4f3a75.zip | |
Merge pull request #6503 from bitraid/nsis-fix-uninst-2
Windows Uninstaller: Fix silent uninstall (again)
| -rwxr-xr-x | misc/nsis/install_pages.nsh | 2 | ||||
| -rwxr-xr-x | misc/nsis/qutebrowser.nsi | 2 |
2 files changed, 1 insertions, 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"
|