Browse Source

Add missing cs_wallet lock that triggers new lock held assertion

A new AssertLockHeld(cs_wallet) call was added in commit a58370e
"Dedup nTimeFirstKey update logic" (part of PR #9108).

The lock held assertion will fail when loading prexisting wallets files from
before the #9108 merge that have watch-only keys.
0.14
Russell Yanofsky 8 years ago
parent
commit
07afcd6379
  1. 2
      src/wallet/walletdb.cpp

2
src/wallet/walletdb.cpp

@ -559,8 +559,8 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet)
bool fNoncriticalErrors = false; bool fNoncriticalErrors = false;
DBErrors result = DB_LOAD_OK; DBErrors result = DB_LOAD_OK;
try {
LOCK(pwallet->cs_wallet); LOCK(pwallet->cs_wallet);
try {
int nMinVersion = 0; int nMinVersion = 0;
if (Read((string)"minversion", nMinVersion)) if (Read((string)"minversion", nMinVersion))
{ {

Loading…
Cancel
Save