From 07561964fcb294651cf426a176f54e4a5d722ac9 Mon Sep 17 00:00:00 2001 From: Yorgos Thessalonikefs Date: Mon, 25 Mar 2024 22:02:08 +0100 Subject: [PATCH] - For #831: Format text, use exclamation icon and explicit label names. --- doc/Changelog | 2 ++ winrc/setup.nsi | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/Changelog b/doc/Changelog index 3fcff16b9..8bfb1444e 100644 --- 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 7374f5d5a..64e5523f7 100644 --- 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