diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-01-31 15:35:26 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-01-31 15:35:30 +0100 |
| commit | 30db5cc6418aa104c05b21ceceea3f04d1066b5f (patch) | |
| tree | cc1e5be832e20b396b0f15500f134cf531f186df /src/wallet/init.cpp | |
| parent | 09a9238c045670ce22a2798a717925248d1483f4 (diff) | |
| parent | 0cd9ad208c327127cc4616ccdc37557fad3cf381 (diff) | |
| download | bitcoin-30db5cc6418aa104c05b21ceceea3f04d1066b5f.tar.xz | |
Merge #15002: 0.17: Backport #14941
0cd9ad208c327127cc4616ccdc37557fad3cf381 rpc: Make unloadwallet wait for complete wallet unload (João Barbosa)
Pull request description:
#14941 makes `unloadwallet` a synchronous call meaning that it waits for the wallet to fully unload/delete.
Tree-SHA512: df7a490306ee2cca399129a4ebfba4b19b65fe67d1657ec3518352fe453327cb347010f94cf7fe4a60aeb51c928cb9ad6b24c40123fd0b9dc0aab5920a59f48d
Diffstat (limited to 'src/wallet/init.cpp')
| -rw-r--r-- | src/wallet/init.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp index b9f267210e..7dc6c30645 100644 --- a/src/wallet/init.cpp +++ b/src/wallet/init.cpp @@ -264,7 +264,11 @@ void WalletInit::Stop() const void WalletInit::Close() const { - for (const std::shared_ptr<CWallet>& pwallet : GetWallets()) { - RemoveWallet(pwallet); + auto wallets = GetWallets(); + while (!wallets.empty()) { + auto wallet = wallets.back(); + wallets.pop_back(); + RemoveWallet(wallet); + UnloadWallet(std::move(wallet)); } } |