aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-01-06 10:33:19 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2014-01-06 10:34:01 +0100
commit7aedb914762eaf25f954790c50f9561103fee4b8 (patch)
treee9b693e5f7da9936da44f8d204456d7d0ea671be /src/main.cpp
parentab086e0bd39b6d010c040c9bf4d781400fc7b9f8 (diff)
parent012ca1c9e4f21e0414f965cb812ecb1f2ddb4f67 (diff)
downloadbitcoin-7aedb914762eaf25f954790c50f9561103fee4b8.tar.xz
Merge pull request #3401
012ca1c LoadWallet: acquire cs_wallet mutex before clearing setKeyPool (Wladimir J. van der Laan) 9569168 Document cs_wallet lock and add AssertLockHeld (Wladimir J. van der Laan) 19a5676 Use mutex pointer instead of name for AssertLockHeld (Wladimir J. van der Laan)
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index e3f9fdd843..017a0768d5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2235,7 +2235,7 @@ void PushGetBlocks(CNode* pnode, CBlockIndex* pindexBegin, uint256 hashEnd)
bool ProcessBlock(CValidationState &state, CNode* pfrom, CBlock* pblock, CDiskBlockPos *dbp)
{
- AssertLockHeld("cs_main");
+ AssertLockHeld(cs_main);
// Check for duplicate
uint256 hash = pblock->GetHash();