Merge pull request #317 from zcoinofficial/deadlock-fix

Fix for potential deadlock when running builtin miner
firoorg · Dec 4, 2018 · 24f13ca · 24f13ca
2 parents f9e690e + a592060
commit 24f13ca
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -1105,7 +1105,7 @@ void static ZcoinMiner(const CChainParams &chainparams) {
                         fvNodesEmpty = vNodes.empty();
                     }
                     {
-                        LOCK(cs_main);
+                        LOCK2(cs_main, mempool.cs);
                         int nCount = 0;
                         fHasZnodesWinnerForNextBlock = 
                                 params.IsRegtest() ||