Merge pull request #130 from MartinNowak/fix14864

fix Issue 14864 - windows uninstall during installation pops up spurious warning
dlang · Aug 4, 2015 · a3afa92 · a3afa92
2 parents 1c71a56 + 526f354
commit a3afa92
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/windows/d2-installer.nsi b/windows/d2-installer.nsi
@@ -421,7 +421,7 @@ Function .onInit
     StrCmp $K 0 +2
       Abort
     ; Remove in background the remaining uninstaller program itself
-    Exec '$R0 /IC False /S'
+    ExecWait '$R0 /IC False /S'
 
   done:
 FunctionEnd
@@ -457,9 +457,11 @@ Section "Uninstall"
   Delete "$SMPROGRAMS\D\D2 64-bit Command Prompt.lnk"
   RMDir "$SMPROGRAMS\D"
 
+  ${GetOptions} $CMDLINE "/S" $R0
+  IfErrors 0 rmdir
   MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
   "The uninstaller will now recursively delete ALL files and directories under '$INSTDIR\dmd2'. Continue?" \
-  IDOK rmdir
+  /SD IDOK IDOK rmdir
   Abort
 
   rmdir: