Merge #9771: Add missing cs_wallet lock that triggers new lock held assertion

07afcd6 Add missing cs_wallet lock that triggers new lock held assertion (Russell Yanofsky)
This commit is contained in:
Wladimir J. van der Laan 2017-02-16 10:25:20 +01:00 committed by Alexander Block
parent da8808fba0
commit bb2c1624c9

View File

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