diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2016-09-09 08:42:30 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2017-06-06 21:17:09 +0000 |
| commit | b124cf04ea47e1eda60bbc26a9690a9715c6b23f (patch) | |
| tree | a6efe783bcbcf8b37736d20de0aa365ae352e161 /src/wallet/wallet.cpp | |
| parent | 19b3648bb52d27c3a9674159d71726b73fe532d9 (diff) | |
| download | bitcoin-b124cf04ea47e1eda60bbc26a9690a9715c6b23f.tar.xz | |
Wallet: Replace pwalletMain with a vector of wallet pointers
Diffstat (limited to 'src/wallet/wallet.cpp')
| -rw-r--r-- | src/wallet/wallet.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 9d49b72308..e5c9f11aa6 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -35,7 +35,7 @@ #include <boost/algorithm/string/replace.hpp> #include <boost/thread.hpp> -CWallet* pwalletMain = NULL; +std::vector<CWalletRef> vpwallets; /** Transaction fee set by the user */ CFeeRate payTxFee(DEFAULT_TRANSACTION_FEE); unsigned int nTxConfirmTarget = DEFAULT_TX_CONFIRM_TARGET; @@ -3926,7 +3926,6 @@ CWallet* CWallet::CreateWalletFromFile(const std::string walletFile) bool CWallet::InitLoadWallet() { if (GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) { - pwalletMain = NULL; LogPrintf("Wallet disabled!\n"); return true; } @@ -3943,7 +3942,7 @@ bool CWallet::InitLoadWallet() if (!pwallet) { return false; } - pwalletMain = pwallet; + vpwallets.push_back(pwallet); return true; } |