highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-12-14 22:58:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1117 from sipa/deadlockfix

Browse Source 
Fix potential deadlock
This commit is contained in:
Pieter Wuille
2012-04-17 11:05:02 -07:00
parent 1ffeb89a52 c581cc16bb
commit caeddc5d37
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.cpp
View File

@@ -2838,8 +2838,8 @@ bool ProcessMessages(CNode* pfrom)
bool SendMessages(CNode* pto, bool fSendTrickle) bool SendMessages(CNode* pto, bool fSendTrickle)
{ {
{ TRY_LOCK(cs_main, lockMain);
LOCK(cs_main); if (lockMain) {
// Don't send anything until we get their version message // Don't send anything until we get their version message
if (pto->nVersion == 0) if (pto->nVersion == 0)
return true; return true;