diff options
| author | John Newbery <john@johnnewbery.com> | 2017-08-28 12:41:33 -0400 |
|---|---|---|
| committer | John Newbery <john@johnnewbery.com> | 2017-09-07 16:21:26 -0700 |
| commit | 062d63102eb1e90168d28589de8bf182e9a6a7d3 (patch) | |
| tree | b0550b5a12daf40f065b21a4c6ddb0dd7619936a | |
| parent | 77fe07c1591395b4279f9f2ff3c36c6bde11fbb7 (diff) | |
| download | bitcoin-062d63102eb1e90168d28589de8bf182e9a6a7d3.tar.xz | |
[wallet] Add CloseWallets() function to wallet/init.cpp
| -rw-r--r-- | src/init.cpp | 5 | ||||
| -rw-r--r-- | src/wallet/init.cpp | 7 | ||||
| -rw-r--r-- | src/wallet/init.h | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/src/init.cpp b/src/init.cpp index d1ffe126d4..3f528a1f5d 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -265,10 +265,7 @@ void Shutdown() UnregisterAllValidationInterfaces(); GetMainSignals().UnregisterBackgroundSignalScheduler(); #ifdef ENABLE_WALLET - for (CWalletRef pwallet : vpwallets) { - delete pwallet; - } - vpwallets.clear(); + CloseWallets(); #endif globalVerifyHandle.reset(); ECC_Stop(); diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp index 2b5c6b1737..84318eac0a 100644 --- a/src/wallet/init.cpp +++ b/src/wallet/init.cpp @@ -257,3 +257,10 @@ void StopWallets() { pwallet->Flush(true); } } + +void CloseWallets() { + for (CWalletRef pwallet : vpwallets) { + delete pwallet; + } + vpwallets.clear(); +} diff --git a/src/wallet/init.h b/src/wallet/init.h index c06b058474..1be2ef9273 100644 --- a/src/wallet/init.h +++ b/src/wallet/init.h @@ -27,4 +27,8 @@ void FlushWallets(); //! Stop all wallets. Wallets will be flushed first. void StopWallets(); + +//! Close all wallets. +void CloseWallets(); + #endif // BITCOIN_WALLET_INIT_H |