diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2017-01-03 14:10:41 -0800 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2017-01-03 14:11:11 -0800 |
| commit | 2a524b8e8fe69ef487fd8ea1b4f7a03f473ed201 (patch) | |
| tree | 0adf634d3f43b22447ed7139775436a0927e7316 /src/wallet/walletdb.cpp | |
| parent | ce5c1f4acae43477989cdf9a82ed33703919cda2 (diff) | |
| parent | 5394b3940dec1fd35952d344e6373fb7115c5490 (diff) | |
| download | bitcoin-2a524b8e8fe69ef487fd8ea1b4f7a03f473ed201.tar.xz | |
Merge #8776: Wallet refactoring leading up to multiwallet
5394b39 Wallet: Split main logic from InitLoadWallet into CreateWalletFromFile (Luke Dashjr)
fb0c934 Wallet: Let the interval-flushing thread figure out the filename (Luke Dashjr)
Diffstat (limited to 'src/wallet/walletdb.cpp')
| -rw-r--r-- | src/wallet/walletdb.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp index 0395e4a072..855fe7f74f 100644 --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -768,7 +768,7 @@ DBErrors CWalletDB::ZapWalletTx(CWallet* pwallet, vector<CWalletTx>& vWtx) return DB_LOAD_OK; } -void ThreadFlushWalletDB(const string& strFile) +void ThreadFlushWalletDB() { // Make this thread recognisable as the wallet flushing thread RenameThread("bitcoin-wallet"); @@ -810,6 +810,7 @@ void ThreadFlushWalletDB(const string& strFile) if (nRefCount == 0) { boost::this_thread::interruption_point(); + const std::string& strFile = pwalletMain->strWalletFile; map<string, int>::iterator _mi = bitdb.mapFileUseCount.find(strFile); if (_mi != bitdb.mapFileUseCount.end()) { |