Merge pull request #1117 from sipa/deadlockfix

Fix potential deadlock
13 years ago · caeddc5d37
parent 1ffeb89a52 c581cc16bb
commit caeddc5d37
1 changed files with 2 additions and 2 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@ -2838,8 +2838,8 @@ bool ProcessMessages(CNode* pfrom)
 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
        if (pto->nVersion == 0)
            return true;