diff options
| author | Gavin Andresen <[email protected]> | 2011-08-31 10:24:45 -0700 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2011-08-31 10:24:45 -0700 |
| commit | cb6c4b883da6896b39bd46f845453f69d0f516f1 (patch) | |
| tree | cc9de8e932d07cf2549a625e6c614a2677ec1b0e /src/db.cpp | |
| parent | Merge pull request #463 from TheBlueMatt/encreadme (diff) | |
| parent | Fixed potential deadlocks in GUI code. (diff) | |
| download | discoin-cb6c4b883da6896b39bd46f845453f69d0f516f1.tar.xz discoin-cb6c4b883da6896b39bd46f845453f69d0f516f1.zip | |
Merge pull request #480 from gavinandresen/deadlocks
Simplify mutex locking, fix deadlocks. Fixes issue #453
Diffstat (limited to 'src/db.cpp')
| -rw-r--r-- | src/db.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/db.cpp b/src/db.cpp index 72542705a..a22b17e34 100644 --- a/src/db.cpp +++ b/src/db.cpp @@ -683,8 +683,7 @@ int CWalletDB::LoadWallet(CWallet* pwallet) #endif //// todo: shouldn't we catch exceptions and try to recover and continue? - CRITICAL_BLOCK(pwallet->cs_mapWallet) - CRITICAL_BLOCK(pwallet->cs_KeyStore) + CRITICAL_BLOCK(pwallet->cs_wallet) { // Get cursor Dbc* pcursor = GetCursor(); |