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/miner.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/miner.cpp')
| -rw-r--r-- | src/miner.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index 97f434851..b01b60cc3 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -650,11 +650,10 @@ void static BitcoinMiner(CWallet *pwallet) } } -void GenerateBitcoins(bool fGenerate, CWallet* pwallet) +void GenerateBitcoins(bool fGenerate, CWallet* pwallet, int nThreads) { static boost::thread_group* minerThreads = NULL; - int nThreads = GetArg("-genproclimit", -1); if (nThreads < 0) { if (Params().NetworkID() == CChainParams::REGTEST) nThreads = 1; |