- For #831: Format text, use exclamation icon and explicit label

  names.

diff --git a/doc/Changelog b/doc/Changelog
index 3fcff16b99ca2c08748603f8d3e5f2cec327479e..8bfb1444ecb3d94c6fec74fff462285d075a91f5 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,8 @@
 25 March 2024: Yorgos
        - Merge #831 from Pierre4012: Improve Windows NSIS installer
          script (setup.nsi).
+       - For #831: Format text, use exclamation icon and explicit label
+         names.
 
 19 March 2024: Wouter
        - Fix rpz so that rpz CNAME can apply after rpz CNAME. And fix that

diff --git a/winrc/setup.nsi b/winrc/setup.nsi
index 7374f5d5a237f090e5f7abaccc8c544bfe4d2303..64e5523f76edebd800214e7ad00a872f0fb875ae 100644 (file)
--- a/winrc/setup.nsi
+++ b/winrc/setup.nsi
@@ -79,14 +79,14 @@ sectionEnd
 
 section "-hidden.postinstall"
        # if Unbund is already installed, ask to stop it to allow file replacement
-       IfFileExists "$INSTDIR\unbound-service-remove.exe" 0 next_label
-       MessageBox MB_YESNO "Unbound is already installed! Would you like to stop the service to continue with the update?" /SD IDYES IDNO false_label # defaults to yes on silent installations
+       IfFileExists "$INSTDIR\unbound-service-remove.exe" 0 service_remove_end
+       MessageBox MB_YESNO|MB_ICONEXCLAMATION "Unbound is already installed!$\r$\n$\r$\nWould you like to stop the service to continue with the update?" /SD IDYES IDNO service_remove_quit # defaults to yes on silent installations
                nsExec::ExecToLog '"$INSTDIR\unbound-service-remove.exe" stop'
                Sleep 1000
-               Goto next_label
-       false_label:
+               Goto service_remove_end
+       service_remove_quit:
                Quit
-       next_label:
+       service_remove_end:
        # copy files
        SetRegView 64
        setOutPath $INSTDIR