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
commit e43a58514d
No known key found for this signature in database
GPG key ID: 74810B012346C9A6

View file

@ -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))
{ {