From 9a849703c0c69467c9ac6bd9ca2e69a3243fc0a5 Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Mon, 31 Dec 2018 18:27:10 +0800 Subject: [PATCH] revert the change here to see if it stops deamons locking up. --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 0b878b245..9e7cd3b60 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4706,7 +4706,7 @@ bool CheckBlock(int32_t *futureblockp,int32_t height,CBlockIndex *pindex,const C int32_t i,j,rejects=0,lastrejects=0; //fprintf(stderr,"put block's tx into mempool\n"); // Copy all non Z-txs in mempool to temporary mempool because there can be tx in local mempool that make the block invalid. - LOCK(mempool.cs); + LOCK2(cs_main,mempool.cs); //fprintf(stderr, "starting... mempoolsize.%ld\n",mempool.size()); list transactionsToRemove; BOOST_FOREACH(const CTxMemPoolEntry& e, mempool.mapTx) {