From e1d253f88e3fbf7253c55ed35e63dd987b3903e1 Mon Sep 17 00:00:00 2001
From: "Vladimir.Orlov" <Vladimir.Orlov@jetbrains.com>
Date: Fri, 18 Mar 2016 17:01:54 +0300
Subject: [PATCH] IDEA-152542 Windows uninstaller: cancelling the warning shown
 on attempt to uninstall a running IDE shows uninstallation progress and
 "Uninstall was completed successfully" message

---
 build/conf/nsis/idea.nsi | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build/conf/nsis/idea.nsi b/build/conf/nsis/idea.nsi
index 8dca886dce46..599c2d44ad21 100644
--- a/build/conf/nsis/idea.nsi
+++ b/build/conf/nsis/idea.nsi
@@ -1014,7 +1014,7 @@ remove_previous_installation:
 remove_dialog:
   MessageBox MB_OKCANCEL|MB_ICONQUESTION|MB_TOPMOST "$(application_running)" IDOK remove_previous_installation IDCANCEL cancel
 cancel:
-  StrCpy $R0 "cancel"
+  Abort
 done:
 FunctionEnd
 
@@ -1022,7 +1022,6 @@ FunctionEnd
 Section "Uninstall"
   ;check if the uninstalled application is running
   Call un.checkIfIDEInUse
-  StrCmp $R0 "cancel" end_of_uninstall 0
   ; Uninstaller is in the \bin directory, we need upper level dir
   StrCpy $productDir $INSTDIR
   StrCpy $INSTDIR $INSTDIR\..