diff options
| author | David Herman <davidherman@google.com> | 2015-01-14 20:40:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-14 20:40:34 +0000 |
| commit | 0988730b1e07802f5ace0ff4a0ffa89cbc3c7002 (patch) | |
| tree | 169982e5c571474f3b20d3e170adbea25be268db | |
| parent | b201303528b10147f75de465e2898dc12996924c (diff) | |
| parent | 9daa6c6e7a254629c3847e295bad42d4d09618a6 (diff) | |
| download | idea-0988730b1e07802f5ace0ff4a0ffa89cbc3c7002.tar.gz | |
Merge "Now deleting the handoff file more aggressively" into studio-1.1-dev
| -rw-r--r-- | native/installer/win/setup_android_studio.nsi | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/native/installer/win/setup_android_studio.nsi b/native/installer/win/setup_android_studio.nsi index 770936e48f5..28919bf13c8 100644 --- a/native/installer/win/setup_android_studio.nsi +++ b/native/installer/win/setup_android_studio.nsi @@ -718,36 +718,40 @@ ${Switch} $0 ${Case} 0 ${If} $1 = 1 # We are the user script, and we successfully elevated ourselves to the - # admin installer, which will do all the real work. - - # Normally, we delete the handoff file right after being elevated to - # admin mode. However, if the user can't elevate to admin mode for some - # reason, we still need to clean this up. - Delete ${USER_ADMIN_HANDOFF_FILE} + # admin installer, which did all the real work. (This case is hit after + # the admin installer has finished) Quit ${ElseIf} $3 <> 0 # We are already admin - we must be the spawned, elevated process. Continue! - ${Break} + Goto uac_success ${ElseIf} $1 = 3 # Somehow the user simply chose another non-admin account. Try again? MessageBox MB_YESNO|MB_ICONEXCLAMATION "You must choose an account with administrative privileges. Try again?" \ /SD IDNO IDYES uac_tryagain IDNO 0 - Quit ${EndIf} - + ${Break} # If here, something went wrong. Fall to the next case to show the abort message. ${Case} 1223 MessageBox MB_ICONSTOP "The installer could not request administrative privileges and must abort." - Quit + ${Break} ${Case} 1062 MessageBox MB_ICONSTOP "Logon service not running, which is needed to request administrative privileges, and the installer must abort." - Quit + ${Break} ${Default} MessageBox MB_ICONSTOP "Unable to elevate [error: $0]" - Quit + ${Break} ${EndSwitch} +# Normally, we delete the handoff file right after being elevated to +# admin mode. However, if the user can't elevate to admin mode for some +# reason, we still need to clean this up. +Delete ${USER_ADMIN_HANDOFF_FILE} +Quit + +uac_success: +Delete ${USER_ADMIN_HANDOFF_FILE} SetShellVarContext all + !macroend # Installer functions |