Updated a lock on LoadWallet to fix a crash on wallet rescan (Existing Datadir) (#582)

mxaddict · alex v · commit 06109e8356eb · 2019-08-11T22:59:24.000+02:00
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
@@ -630,7 +630,7 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet)
     DBErrors result = DB_LOAD_OK;
 
     try {
-        LOCK(pwallet->cs_wallet);
+        LOCK2(cs_main, pwallet->cs_wallet);
         int nMinVersion = 0;
         if (Read((string)"minversion", nMinVersion))
         {

Original file line number	Diff line number	Diff line change
`@@ -630,7 +630,7 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet)`
`630`	`630`	`DBErrors result = DB_LOAD_OK;`
`631`	`631`
`632`	`632`	`try {`
`633`		`- LOCK(pwallet->cs_wallet);`
	`633`	`+ LOCK2(cs_main, pwallet->cs_wallet);`
`634`	`634`	`int nMinVersion = 0;`
`635`	`635`	`if (Read((string)"minversion", nMinVersion))`
`636`	`636`	`{`