Merge pull request #4287 from laanwj/2014_06_sideeffect

Remove side effect in assertion in ProcessGetData
2014-06-04 20:15:45 -04:00 · 2014-06-04 20:15:45 -04:00 · 4fee61a905
parent de0cbd1078 4a48a0671d
commit 4fee61a905
1 changed files with 2 additions and 1 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@ -3390,7 +3390,8 @@ void static ProcessGetData(CNode* pfrom)
                {
                    // Send block from disk
                    CBlock block;
-                    assert(ReadBlockFromDisk(block, (*mi).second));
+                    if (!ReadBlockFromDisk(block, (*mi).second))
+                        assert(!"cannot load block from disk");
                    if (inv.type == MSG_BLOCK)
                        pfrom->PushMessage("block", block);
                    else // MSG_FILTERED_BLOCK)