DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge pull request #161 from jl777/dev

Browse Source 
Dev
This commit is contained in:
jl777
2017-02-03 16:19:18 +02:00
committed by GitHub
parent ba34a1fd8f 5304e9459b
commit 74bfdc190c
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.cpp
View File

@@ -4343,7 +4343,11 @@ void static ProcessGetData(CNode* pfrom)
// Send block from disk // Send block from disk
CBlock block; CBlock block;
if (!ReadBlockFromDisk(block, (*mi).second)) if (!ReadBlockFromDisk(block, (*mi).second))
assert(!"cannot load block from disk"); {
//assert(!"cannot load block from disk");
}
else
{
if (inv.type == MSG_BLOCK) if (inv.type == MSG_BLOCK)
pfrom->PushMessage("block", block); pfrom->PushMessage("block", block);
else // MSG_FILTERED_BLOCK) else // MSG_FILTERED_BLOCK)
@@ -4367,7 +4371,7 @@ void static ProcessGetData(CNode* pfrom)
// else // else
// no response // no response
} }
}
// Trigger the peer node to send a getblocks request for the next batch of inventory // Trigger the peer node to send a getblocks request for the next batch of inventory
if (inv.hash == pfrom->hashContinue) if (inv.hash == pfrom->hashContinue)
{ {