aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormrbandrews <[email protected]>2016-02-29 13:34:09 -0500
committermrbandrews <[email protected]>2016-02-29 13:34:09 -0500
commit0040118959305c4f2b0e7e9c42cf3e865607a04a (patch)
tree370caed8dc52755d6fe60da4b91592da5ad87c73 /src
parentMerge #7537: wallet: Warn on unexpected EOF while salvaging wallet (diff)
downloaddiscoin-0040118959305c4f2b0e7e9c42cf3e865607a04a.tar.xz
discoin-0040118959305c4f2b0e7e9c42cf3e865607a04a.zip
Fixes ZMQ startup with bad arguments.
Diffstat (limited to 'src')
-rw-r--r--src/zmq/zmqnotificationinterface.cpp1
-rw-r--r--src/zmq/zmqpublishnotifier.cpp1
2 files changed, 1 insertions, 1 deletions
diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp
index c8adcf846..870553242 100644
--- a/src/zmq/zmqnotificationinterface.cpp
+++ b/src/zmq/zmqnotificationinterface.cpp
@@ -100,7 +100,6 @@ bool CZMQNotificationInterface::Initialize()
if (i!=notifiers.end())
{
- Shutdown();
return false;
}
diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp
index ddc8fe93e..f5839620f 100644
--- a/src/zmq/zmqpublishnotifier.cpp
+++ b/src/zmq/zmqpublishnotifier.cpp
@@ -69,6 +69,7 @@ bool CZMQAbstractPublishNotifier::Initialize(void *pcontext)
if (rc!=0)
{
zmqError("Failed to bind address");
+ zmq_close(psocket);
return false;
}