diff options
| author | Daniel Molkentin <danimo@owncloud.com> | 2015-06-05 10:17:39 +0300 |
|---|---|---|
| committer | Daniel Molkentin <danimo@owncloud.com> | 2015-06-05 10:17:39 +0300 |
| commit | 553e8311218818ffb62e2faec8bee979fa1fa63c (patch) | |
| tree | 04e3230fcea3f286c223b31338a39aa6bfc14d47 /cmake/modules/NSIS.template.in | |
| parent | e9ff471e1caf5f396b411b113c20f34e267a9124 (diff) | |
Revert "Adjust to new version of NSIS UAC"
This reverts commit 1d600ceecc12401529ba4319fd72750b8a2ef762.
Diffstat (limited to 'cmake/modules/NSIS.template.in')
| -rw-r--r-- | cmake/modules/NSIS.template.in | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in index 0c8376b00..1a776a702 100644 --- a/cmake/modules/NSIS.template.in +++ b/cmake/modules/NSIS.template.in @@ -248,7 +248,11 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}" ############################################################################## Function LaunchApplication - !insertmacro UAC_AsUser_ExecShell "" "$INSTDIR\${APPLICATION_EXECUTABLE}" "" "" "" + ${UAC.CallFunctionAsUser} LaunchApplicationAsUser +FunctionEnd + +Function LaunchApplicationAsUser + Exec "$INSTDIR\${APPLICATION_EXECUTABLE}" FunctionEnd ############################################################################## @@ -363,6 +367,7 @@ Function PageLeaveReinstall RMDir $INSTDIR no_remove_uninstaller: StrCmp $R0 "2" 0 +3 + UAC::Unload Quit BringToFront reinst_done: @@ -757,7 +762,7 @@ Function .onInit ${MementoSectionRestore} UAC_Elevate: - !insertmacro UAC_RunElevated + UAC::RunElevated StrCmp 1223 $0 UAC_ElevationAborted ; UAC dialog aborted by user? StrCmp 0 $0 0 UAC_Err ; Error? StrCmp 1 $1 0 UAC_Success ;Are we the real deal or just the wrapper? @@ -805,9 +810,11 @@ Function .onInstSuccess ${AndIf} $InstallRunIfSilent == "yes" Call LaunchApplication ${EndIf} + UAC::Unload ;Must call unload! FunctionEnd Function .onInstFailed + UAC::Unload ;Must call unload! FunctionEnd ############################################################################## @@ -820,7 +827,7 @@ Function un.onInit Call un.SetLang UAC_Elevate: - !insertmacro UAC_RunElevated + UAC::RunElevated StrCmp 1223 $0 UAC_ElevationAborted ; UAC dialog aborted by user? StrCmp 0 $0 0 UAC_Err ; Error? StrCmp 1 $1 0 UAC_Success ;Are we the real deal or just the wrapper? @@ -851,7 +858,9 @@ Function un.onInit FunctionEnd Function un.onUnInstSuccess + UAC::Unload ;Must call unload! FunctionEnd Function un.onUnInstFailed + UAC::Unload ;Must call unload! FunctionEnd |