diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-03-15 09:29:47 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-03-15 09:29:58 +0100 |
| commit | a6a860796a44a2805a58391a009ba22752f64e32 (patch) | |
| tree | 2215777320ef15fe9b6c235040b324c5b3f25aa5 | |
| parent | 48f39058315c908c360acb596923cbc090119480 (diff) | |
| parent | 0040118959305c4f2b0e7e9c42cf3e865607a04a (diff) | |
Merge #7621: Fixes ZMQ startup with bad arguments.
0040118 Fixes ZMQ startup with bad arguments. (mrbandrews)
| -rw-r--r-- | src/zmq/zmqnotificationinterface.cpp | 1 | ||||
| -rw-r--r-- | src/zmq/zmqpublishnotifier.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp index c8adcf8462..8705532429 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 ddc8fe93e9..f5839620ff 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; } |