diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-04-23 13:02:18 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-04-23 13:03:41 -0400 |
| commit | 4bd7187da81767ecb8aadcb86c9e53dc8636695f (patch) | |
| tree | accea5493f913680ba3ba3ce263909ecadea318d /src/ui_interface.h | |
| parent | e9e777e21b42b3f4d5aef1650d72036e72170ba2 (diff) | |
| parent | 6dd469a3bea60d8857ec0be625c2ef8a7716c148 (diff) | |
| download | bitcoin-4bd7187da81767ecb8aadcb86c9e53dc8636695f.tar.xz | |
Merge #15699: Remove no-op CClientUIInterface::[signal_name]_disconnect. Disconnect BlockNotifyGenesisWait and RPCNotifyBlockChange properly.
6dd469a3be Disconnect BlockNotifyGenesisWait and RPCNotifyBlockChange properly. Remove no-op CClientUIInterface::[signal_name]_disconnect. (practicalswift)
Pull request description:
Resolves #15698.
Changes:
* Remove no-op `CClientUIInterface::[signal_name]_disconnect`.
* Disconnect `BlockNotifyGenesisWait` and `RPCNotifyBlockChange` properly.
ACKs for commit 6dd469:
MarcoFalke:
utACK 6dd469a3bea60d8857ec0be625c2ef8a7716c148
Tree-SHA512: 0b50d658fa72261332bc57ddea379fd08f4bc1de392c10c628e20142d6fd244b606c39fd0665d6bc39324c1aa8c8814ac942b4659106279e33b90206aaf37411
Diffstat (limited to 'src/ui_interface.h')
| -rw-r--r-- | src/ui_interface.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/ui_interface.h b/src/ui_interface.h index 60d85bc142..d408f6f889 100644 --- a/src/ui_interface.h +++ b/src/ui_interface.h @@ -81,8 +81,7 @@ public: #define ADD_SIGNALS_DECL_WRAPPER(signal_name, rtype, ...) \ rtype signal_name(__VA_ARGS__); \ using signal_name##Sig = rtype(__VA_ARGS__); \ - boost::signals2::connection signal_name##_connect(std::function<signal_name##Sig> fn); \ - void signal_name##_disconnect(std::function<signal_name##Sig> fn); + boost::signals2::connection signal_name##_connect(std::function<signal_name##Sig> fn); /** Show message box. */ ADD_SIGNALS_DECL_WRAPPER(ThreadSafeMessageBox, bool, const std::string& message, const std::string& caption, unsigned int style); |