Merge bitcoin#7621: Fixes ZMQ startup with bad arguments.

0040118 Fixes ZMQ startup with bad arguments. (mrbandrews)
dpc · Mar 15, 2016 · a6a8607 · a6a8607
2 parents 48f3905 + 0040118
commit a6a8607
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git 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
@@ -69,6 +69,7 @@ bool CZMQAbstractPublishNotifier::Initialize(void *pcontext)
         if (rc!=0)
         {
             zmqError("Failed to bind address");
+            zmq_close(psocket);
             return false;
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -100,7 +100,6 @@ bool CZMQNotificationInterface::Initialize() @@
         if (i!=notifiers.end())
         {
-            Shutdown();
             return false;
         }
@@ Expand Down @@