diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-02-06 15:01:49 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-02-06 16:14:17 +0100 |
| commit | 02464da5e4aa8c19d4fff3859dcdee822e2af78c (patch) | |
| tree | 00784ec6963a8370dc424c679856abd61331874e /src/wallet/wallet.cpp | |
| parent | 870cd2b58aba30ecd57c624ab1f1724b3235cb4d (diff) | |
| parent | d63ff6265b0c6ae30efcbb9120d4db419606198a (diff) | |
| download | bitcoin-02464da5e4aa8c19d4fff3859dcdee822e2af78c.tar.xz | |
Merge #9227: Make nWalletDBUpdated atomic to avoid a potential race.
d63ff62 Make nWalletDBUpdated atomic to avoid a potential race. (Patrick Strateman)
Diffstat (limited to 'src/wallet/wallet.cpp')
| -rw-r--r-- | src/wallet/wallet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index a7b8022bd9..a5e8752fc0 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3691,7 +3691,7 @@ CWallet* CWallet::CreateWalletFromFile(const std::string walletFile) walletInstance->ScanForWalletTransactions(pindexRescan, true); LogPrintf(" rescan %15dms\n", GetTimeMillis() - nStart); walletInstance->SetBestChain(chainActive.GetLocator()); - nWalletDBUpdated++; + CWalletDB::IncrementUpdateCounter(); // Restore wallet transaction metadata after -zapwallettxes=1 if (GetBoolArg("-zapwallettxes", false) && GetArg("-zapwallettxes", "1") != "2") |