From 640b0528ab0f8bfdfd5cc6b26a9f4681c42b449a Mon Sep 17 00:00:00 2001 From: "Vladimir.Orlov" Date: Fri, 14 Dec 2018 09:06:41 +0300 Subject: [PATCH] IDEA-158855 Windows installer starts uninstaller even when clicking back --- build/conf/nsis/idea.nsi | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/build/conf/nsis/idea.nsi b/build/conf/nsis/idea.nsi index 55f6af384990..c307eec9144f 100644 --- a/build/conf/nsis/idea.nsi +++ b/build/conf/nsis/idea.nsi @@ -884,17 +884,19 @@ complete: !insertmacro MUI_HEADER_TEXT "$(uninstall_previous_installations_title)" "$(uninstall_previous_installations)" !insertmacro INSTALLOPTIONS_WRITE "UninstallOldVersions.ini" "Field 1" "Text" "$(uninstall_previous_installations_prompt)" !insertmacro INSTALLOPTIONS_WRITE "UninstallOldVersions.ini" "Field 3" "Flags" "FOCUS" - !insertmacro INSTALLOPTIONS_DISPLAY "UninstallOldVersions.ini" - + !insertmacro INSTALLOPTIONS_DISPLAY_RETURN "UninstallOldVersions.ini" + Pop $9 + ${If} $9 == "success" loop: - ;uninstall chosen installation(s) - !insertmacro INSTALLOPTIONS_READ $0 "UninstallOldVersions.ini" "Field $8" "State" - !insertmacro INSTALLOPTIONS_READ $3 "UninstallOldVersions.ini" "Field $8" "Text" - ${If} $0 == "1" - Call uninstallOldVersion + ;uninstall chosen installation(s) + !insertmacro INSTALLOPTIONS_READ $0 "UninstallOldVersions.ini" "Field $8" "State" + !insertmacro INSTALLOPTIONS_READ $3 "UninstallOldVersions.ini" "Field $8" "Text" + ${If} $0 == "1" + Call uninstallOldVersion ${EndIf} IntOp $8 $8 - 1 StrCmp $8 $control_fields finish loop + ${EndIf} ${EndIf} finish: FunctionEnd