Merge branch 'master' into FSM

2018-12-17 11:49:30 +08:00
parent 2ebdae67e8 3028d884e5
commit 4a2ea81f3c
55 changed files with 1547 additions and 892 deletions
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -332,7 +332,7 @@ UniValue setgenerate(const UniValue& params, bool fHelp)
    if (params.size() > 0)
        fGenerate = params[0].get_bool();

-    int nGenProcLimit = GetArg("-genproclimit", -1);;
+    int nGenProcLimit = GetArg("-genproclimit", 0);;
    if (params.size() > 1)
    {
        nGenProcLimit = params[1].get_int();