Merge pull request #161 from jl777/dev

Dev
2017-02-03 16:19:18 +02:00
parent ba34a1fd8f 5304e9459b
commit 74bfdc190c
1 changed files with 23 additions and 19 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4343,7 +4343,11 @@ void static ProcessGetData(CNode* pfrom)
                    // Send block from disk
                    CBlock block;
                    if (!ReadBlockFromDisk(block, (*mi).second))
-                        assert(!"cannot load block from disk");
+                    {
+                        //assert(!"cannot load block from disk");
+                    }
+                    else
+                    {
                        if (inv.type == MSG_BLOCK)
                            pfrom->PushMessage("block", block);
                        else // MSG_FILTERED_BLOCK)
@@ -4367,7 +4371,7 @@ void static ProcessGetData(CNode* pfrom)
                            // else
                            // no response
                        }
-
+                    }
                    // Trigger the peer node to send a getblocks request for the next batch of inventory
                    if (inv.hash == pfrom->hashContinue)
                    {