diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-04 12:10:29 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-04 12:10:46 +0100 |
| commit | aa03fb35c4b395bad9f9731afa62f29532ddf15a (patch) | |
| tree | 7a50e9ccda86f4d7bd6da1c9f61628875d54b19b /src/init.cpp | |
| parent | 29c3c43e19caf70ad707ecf6c98d879254ea67cc (diff) | |
| parent | de0499d3b8352334357c8d60931cd5d2be5ab61d (diff) | |
| download | bitcoin-aa03fb35c4b395bad9f9731afa62f29532ddf15a.tar.xz | |
Merge pull request #6927
de0499d Fix ZMQ Notification initialization and shutdown (João Barbosa)
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/init.cpp b/src/init.cpp index d0f73a632b..1c79ff9f46 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -222,7 +222,6 @@ void Shutdown() #if ENABLE_ZMQ if (pzmqNotificationInterface) { UnregisterValidationInterface(pzmqNotificationInterface); - pzmqNotificationInterface->Shutdown(); delete pzmqNotificationInterface; pzmqNotificationInterface = NULL; } @@ -1180,7 +1179,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) pzmqNotificationInterface = CZMQNotificationInterface::CreateWithArguments(mapArgs); if (pzmqNotificationInterface) { - pzmqNotificationInterface->Initialize(); RegisterValidationInterface(pzmqNotificationInterface); } #endif |