diff options
| author | Wladimir J. van der Laan <[email protected]> | 2013-11-25 15:43:11 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2013-11-25 15:47:20 +0100 |
| commit | 4c3e24644d3a873b11517d90f7d3f0a327a45bb7 (patch) | |
| tree | 4943958fb850e77ebfc2e21568c90445118c63aa /src/init.cpp | |
| parent | Merge pull request #3302 (diff) | |
| parent | setgenerate creates multiple blocks in -regtest mode (diff) | |
| download | discoin-4c3e24644d3a873b11517d90f7d3f0a327a45bb7.tar.xz discoin-4c3e24644d3a873b11517d90f7d3f0a327a45bb7.zip | |
Merge pull request #3294
c8b7425 setgenerate creates multiple blocks in -regtest mode (Gavin Andresen)
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/init.cpp b/src/init.cpp index b2e7ddf33..16eccc6de 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -112,7 +112,7 @@ void Shutdown() ShutdownRPCMining(); if (pwalletMain) bitdb.Flush(false); - GenerateBitcoins(false, NULL); + GenerateBitcoins(false, NULL, 0); StopNode(); { LOCK(cs_main); @@ -1050,7 +1050,7 @@ bool AppInit2(boost::thread_group& threadGroup, bool fForceServer) // Generate coins in the background if (pwalletMain) - GenerateBitcoins(GetBoolArg("-gen", false), pwalletMain); + GenerateBitcoins(GetBoolArg("-gen", false), pwalletMain, GetArg("-genproclimit", -1)); // ********************************************************* Step 12: finished |