mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Adjust to new version of NSIS UAC"

Browse Source 
This reverts commit 1d600ceecc.
This commit is contained in:
Daniel Molkentin 2015-06-05 09:17:39 +02:00
parent e9ff471e1c
commit 553e831121
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmake/modules/NSIS.template.in
View File

@ -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