- Fix #1178: attempt to fix setup error at end, pop result values

  at end of install.

git-svn-id: file:///svn/unbound/trunk@3963 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index b46a396d4c5e5be1ca3e46fa3f54d5768068061b..dce39b2e59d935cb045cd93762d008bf3dac81ab 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+14 December 2016: Wouter
+       - Fix #1178: attempt to fix setup error at end, pop result values
+         at end of install.
+
 13 December 2016: Wouter
        - Fix #1182: Fix Resource leak (socket), at startup.
        - Fix unbound-control and ipv6 only.

diff --git a/winrc/setup.nsi b/winrc/setup.nsi
index d70c56b659e352663804e41a9392aaf4f6794b19..c5d6b2ceb93360541335c92304433e5e1a8def67 100644 (file)
--- a/winrc/setup.nsi
+++ b/winrc/setup.nsi
@@ -148,8 +148,10 @@ section "-hidden.postinstall"
 
        # install service entry
        nsExec::ExecToLog '"$INSTDIR\unbound-service-install.exe"'
+       Pop $0 # return value/error/timeout
        # start unbound service
        nsExec::ExecToLog '"$INSTDIR\unbound-service-install.exe" start'
+       Pop $0 # return value/error/timeout
 sectionEnd
 
 # set section descriptions
@@ -171,8 +173,10 @@ LangString DESC_rootkey ${LANG_ENGLISH} "Set up to use the DNSSEC root trust anc
 section "un.Unbound"
        # stop unbound service
        nsExec::ExecToLog '"$INSTDIR\unbound-service-remove.exe" stop'
+       Pop $0 # return value/error/timeout
        # uninstall service entry
        nsExec::ExecToLog '"$INSTDIR\unbound-service-remove.exe"'
+       Pop $0 # return value/error/timeout
        # deregister uninstall
        DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Unbound"
        Delete "$INSTDIR\uninst.exe"   # delete self