diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-09-02 17:35:30 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-09-02 17:35:30 +0200 |
| commit | 7a15d4ff67c9a6e3b6b5a63f82f76ffe1937c3b8 (patch) | |
| tree | 8ac8a0e7b9994ade96f635dd261c5ae46703f7df /src/db.cpp | |
| parent | f43f46c175d7e6d7426536f8efcad05d2eafba80 (diff) | |
| parent | 86fd7c5af6cf3f907c50cf25ff844cd23e271c70 (diff) | |
| download | bitcoin-7a15d4ff67c9a6e3b6b5a63f82f76ffe1937c3b8.tar.xz | |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Conflicts:
src/main.cpp
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 72542705a6..a22b17e34c 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(); |