diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-08-31 10:24:45 -0700 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-08-31 10:24:45 -0700 |
| commit | cb6c4b883da6896b39bd46f845453f69d0f516f1 (patch) | |
| tree | cc9de8e932d07cf2549a625e6c614a2677ec1b0e /src/main.cpp | |
| parent | 21189a42a735ff66166c17c53eb44998346059d6 (diff) | |
| parent | 471426fb3b2c2fa37640c03819c4f7be69ba8301 (diff) | |
| download | bitcoin-cb6c4b883da6896b39bd46f845453f69d0f516f1.tar.xz | |
Merge pull request #480 from gavinandresen/deadlocks
Simplify mutex locking, fix deadlocks. Fixes issue #453
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index f483312065..390632aaf5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2879,7 +2879,7 @@ bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey) reservekey.KeepKey(); // Track how many getdata requests this block gets - CRITICAL_BLOCK(wallet.cs_mapRequestCount) + CRITICAL_BLOCK(wallet.cs_wallet) wallet.mapRequestCount[pblock->GetHash()] = 0; // Process this block the same as if we had received it from another node |