Merge branch 'FSM' of https://github.com/jl777/komodo

2019-01-06 23:19:16 +08:00
parent 1cd8881329 5921eb2923
commit 5a917a6f02
8 changed files with 164 additions and 62 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4809,6 +4809,7 @@ bool CheckBlock(int32_t *futureblockp,int32_t height,CBlockIndex *pindex,const C

    if ( ASSETCHAINS_CC != 0 )
    {
+        LOCK2(cs_main,mempool.cs);
        // here we add back all txs from the temp mempool to the main mempool.
        BOOST_FOREACH(const CTxMemPoolEntry& e, tmpmempool.mapTx)
        {