diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-01-20 17:34:37 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-01-20 19:39:41 +0100 |
| commit | 98159132c3e7f3ea62dc8d3e0afc1e49a6000c3d (patch) | |
| tree | fa36bf70769791e1d9b3a9fa5b6baf6701b1e267 /src/zmq/zmqpublishnotifier.cpp | |
| parent | bb123c6527c02a5936dbf7fee675b992b5c21936 (diff) | |
| parent | cd67b1dcb8f1eca8c0c7cecc6f4de27c7efe41d5 (diff) | |
Merge #17792: 0.19: Backports
cd67b1dcb8f1eca8c0c7cecc6f4de27c7efe41d5 Use correct C++11 header for std::swap() (Hennadii Stepanov)
b8101fb7ac4bfa0e5c0ee2459b24bddaf59fe7c4 Fix comparison function signature (Hennadii Stepanov)
eac49073eb7c5d630dd9a285e36f743fa902c0ee Don't allow implementers to think ScriptHash(Witness*()) results in nesting computation (Gregory Sanders)
e2c45d89f7219fd5bcf19a6e04b291abbb4b5f95 IsUsedDestination shouldn't use key id as script id for ScriptHash (Gregory Sanders)
a5489c9892fc12cb70c6c7b017881a9218d0b041 IsUsedDestination should count any known single-key address (Gregory Sanders)
88729d804e39fbb42aa92c039afe3641edf9190c Fix issue with conflicted mempool tx in listsinceblock (Adam Jonas)
eafcea7a0ab17512f2b9e2a724685ca193920f04 gui: Fix duplicate wallet showing up (João Barbosa)
7e66d04770bfb21862e52736c4859d7a878cb906 Drop signal CClientUIInterface::LoadWallet (Russell Yanofsky)
179d55f0526082b46415a7f5b6c3742a403f3306 zmq: Fix due to invalid argument and multiple notifiers (João Barbosa)
Pull request description:
Backports
- #16963
- #17445
- #17258
- #17621
- #17924
- #17634
ACKs for top commit:
laanwj:
ACK cd67b1dcb8f1eca8c0c7cecc6f4de27c7efe41d5, checked that I got more or less the same result (including conflict resolution) backporting these commits
Tree-SHA512: 645786267cfb10a01a56f7cfd91ddead5f1475df5714595ae480237e04d40c5cfb7460b40532279cacd83e4b775a4ace68a258ec2184b8ad0e997a690a9245e5
Diffstat (limited to 'src/zmq/zmqpublishnotifier.cpp')
| -rw-r--r-- | src/zmq/zmqpublishnotifier.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp index ba89d1401d..233a45d19f 100644 --- a/src/zmq/zmqpublishnotifier.cpp +++ b/src/zmq/zmqpublishnotifier.cpp @@ -112,7 +112,8 @@ bool CZMQAbstractPublishNotifier::Initialize(void *pcontext) void CZMQAbstractPublishNotifier::Shutdown() { - assert(psocket); + // Early return if Initialize was not called + if (!psocket) return; int count = mapPublishNotifiers.count(address); |