diff options
| author | Wladimir J. van der Laan <[email protected]> | 2019-02-04 10:45:10 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2019-02-04 11:09:58 +0100 |
| commit | 64127b3098a1aab70200b6d07194dce072ad5cf2 (patch) | |
| tree | f73cae4bb143a18ab0ac1854328a47ade2a62a42 /src/validationinterface.cpp | |
| parent | Merge #15330: test: Fix race in p2p_invalid_messages (diff) | |
| parent | Check m_internals in UnregisterValidationInterface (diff) | |
| download | discoin-64127b3098a1aab70200b6d07194dce072ad5cf2.tar.xz discoin-64127b3098a1aab70200b6d07194dce072ad5cf2.zip | |
Merge #15280: gui: Fix shutdown order
0dd6a8c12489ea4428b398a2328dde5d1a9fe39b Check m_internals in UnregisterValidationInterface (João Barbosa)
fd6d499bdacfa29f25b0f675375e3feaced08667 gui: Fix m_node.startShutdown() order (João Barbosa)
07b9aadcfc7cc72be9df344dd5715cf8fc78f0ad gui: Expose BitcoinGUI::unsubscribeFromCoreSignals (João Barbosa)
60e190ceb3563a8102d42fdfcbefccdd1b53e812 gui: Fix WalletController deletion (João Barbosa)
Pull request description:
This PR consists in small fixes in order to have a clean shutdown from the GUI.
Tree-SHA512: a9c641f202bc810698c4a39d5c5a1f54e54bdab098c412d65418879e00764a9db9f38383813914d591e24e097e49f177942b2ae6c57bba05dcc095e8a1d0b8f4
Diffstat (limited to 'src/validationinterface.cpp')
| -rw-r--r-- | src/validationinterface.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp index 2e13bef19..70c274d20 100644 --- a/src/validationinterface.cpp +++ b/src/validationinterface.cpp @@ -107,7 +107,9 @@ void RegisterValidationInterface(CValidationInterface* pwalletIn) { } void UnregisterValidationInterface(CValidationInterface* pwalletIn) { - g_signals.m_internals->m_connMainSignals.erase(pwalletIn); + if (g_signals.m_internals) { + g_signals.m_internals->m_connMainSignals.erase(pwalletIn); + } } void UnregisterAllValidationInterfaces() { |