diff options
author | Araq <rumpf_a@web.de> | 2014-10-23 23:13:49 +0200 |
---|---|---|
committer | Araq <rumpf_a@web.de> | 2014-10-23 23:13:49 +0200 |
commit | 201d3c9ed0dac94a337f23416c556b45f7fc1138 (patch) | |
tree | ce2e5a5042d2de98dd8079507cc5728d367ea4f1 /tools | |
parent | ca4d7b1ea865d8ec3c76276c59d83edaac8a392f (diff) | |
parent | d72818e3a390a7e887e18568e82b26ba99214717 (diff) | |
download | Nim-201d3c9ed0dac94a337f23416c556b45f7fc1138.tar.gz |
Merge branch 'devel' into bigbreak
Conflicts: web/news.txt
Diffstat (limited to 'tools')
-rw-r--r-- | tools/niminst/nsis.tmpl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/niminst/nsis.tmpl b/tools/niminst/nsis.tmpl index c4270081e..974def634 100644 --- a/tools/niminst/nsis.tmpl +++ b/tools/niminst/nsis.tmpl @@ -192,8 +192,14 @@ ${If} $0 == "success" ZipDLL::extractall "$TEMP\?zipName" "$INSTDIR\?dir" Delete "$TEMP\?zipName" + ${ElseIf} $0 == "cancel" + MessageBox MB_ICONQUESTION|MB_YESNO|MB_TOPMOST \ + "Download of component '?sectionName' cancelled. Continue installation process??" \ + IDYES ignore + abort ${Else} - MessageBox MB_ICONSTOP|MB_ABORTRETRYIGNORE "Error: $0" IDRETRY retry IDIGNORE ignore + MessageBox MB_ICONSTOP|MB_ABORTRETRYIGNORE|MB_TOPMOST "Error: $0" \ + IDRETRY retry IDIGNORE ignore abort ${EndIf} @@ -252,4 +258,4 @@ Function .onInit ${GetRoot} "$EXEDIR" $R0 strCpy $INSTDIR "$R0\?{c.name}" - FunctionEnd \ No newline at end of file + FunctionEnd |