diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-14 10:16:18 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-14 10:16:25 +0200 |
| commit | 881d7eaf29f78591099dc167f6f0ae07ed3fbab7 (patch) | |
| tree | f84faeade84e2796dd847b449ec6063097824a28 /src | |
| parent | 57b34599b2deb179ff1bd97ffeab91ec9f904d85 (diff) | |
| parent | 36fa01f217fbc32afb90314fd257650c71a47045 (diff) | |
| download | bitcoin-881d7eaf29f78591099dc167f6f0ae07ed3fbab7.tar.xz | |
Merge #8715: net: only delete CConnman if it's been created
36fa01f net: only delete CConnman if it's been created (Cory Fields)
Diffstat (limited to 'src')
| -rw-r--r-- | src/init.cpp | 1 | ||||
| -rw-r--r-- | src/net.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp index e9552da67d..8d1e330a05 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -200,7 +200,6 @@ void Shutdown() pwalletMain->Flush(false); #endif MapPort(false); - g_connman->Stop(); g_connman.reset(); StopTorControl(); diff --git a/src/net.cpp b/src/net.cpp index 888ed44377..cc9728b853 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -2205,6 +2205,7 @@ void CConnman::DeleteNode(CNode* pnode) CConnman::~CConnman() { + Stop(); } size_t CConnman::GetAddressCount() const |