diff options
| author | Daniel Molkentin <danimo@owncloud.com> | 2015-05-28 16:54:52 +0300 |
|---|---|---|
| committer | Daniel Molkentin <danimo@owncloud.com> | 2015-06-03 09:21:10 +0300 |
| commit | 1d600ceecc12401529ba4319fd72750b8a2ef762 (patch) | |
| tree | 500b58acbc7175bcb85b72582f727fd5d91be406 /cmake/modules/NSIS.template.in | |
| parent | e1a36b53dc4646118cc2bc30b368c7f8a7ca264c (diff) | |
Adjust to new version of NSIS UAC
Diffstat (limited to 'cmake/modules/NSIS.template.in')
| -rw-r--r-- | cmake/modules/NSIS.template.in | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in index 1a776a702..0c8376b00 100644 --- a/cmake/modules/NSIS.template.in +++ b/cmake/modules/NSIS.template.in @@ -248,11 +248,7 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}" ############################################################################## Function LaunchApplication - ${UAC.CallFunctionAsUser} LaunchApplicationAsUser -FunctionEnd - -Function LaunchApplicationAsUser - Exec "$INSTDIR\${APPLICATION_EXECUTABLE}" + !insertmacro UAC_AsUser_ExecShell "" "$INSTDIR\${APPLICATION_EXECUTABLE}" "" "" "" FunctionEnd ############################################################################## @@ -367,7 +363,6 @@ Function PageLeaveReinstall RMDir $INSTDIR no_remove_uninstaller: StrCmp $R0 "2" 0 +3 - UAC::Unload Quit BringToFront reinst_done: @@ -762,7 +757,7 @@ Function .onInit ${MementoSectionRestore} UAC_Elevate: - UAC::RunElevated + !insertmacro 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? @@ -810,11 +805,9 @@ Function .onInstSuccess ${AndIf} $InstallRunIfSilent == "yes" Call LaunchApplication ${EndIf} - UAC::Unload ;Must call unload! FunctionEnd Function .onInstFailed - UAC::Unload ;Must call unload! FunctionEnd ############################################################################## @@ -827,7 +820,7 @@ Function un.onInit Call un.SetLang UAC_Elevate: - UAC::RunElevated + !insertmacro 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? @@ -858,9 +851,7 @@ Function un.onInit FunctionEnd Function un.onUnInstSuccess - UAC::Unload ;Must call unload! FunctionEnd Function un.onUnInstFailed - UAC::Unload ;Must call unload! FunctionEnd |