diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-10 17:12:09 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-10 17:12:40 +0200 |
| commit | fac21df5f00d1d84d9c1c251d273f2e8070877ec (patch) | |
| tree | 545037c5bee3009c42a97e54d1c2090c5acfe3ea /src/miner.cpp | |
| parent | c52e8b300a7a5c65f2a1c2e52a8129280de2c301 (diff) | |
| parent | 6ebac0782f9201e86d507fe7fff71f2c35680682 (diff) | |
| download | bitcoin-fac21df5f00d1d84d9c1c251d273f2e8070877ec.tar.xz | |
Merge pull request #6370
6ebac07 Remove ChainParams::DefaultMinerThreads (Wladimir J. van der Laan)
Diffstat (limited to 'src/miner.cpp')
| -rw-r--r-- | src/miner.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index bdb85c8c79..5e575f45f1 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -542,13 +542,8 @@ void GenerateBitcoins(bool fGenerate, int nThreads, const CChainParams& chainpar { static boost::thread_group* minerThreads = NULL; - if (nThreads < 0) { - // In regtest threads defaults to 1 - if (Params().DefaultMinerThreads()) - nThreads = Params().DefaultMinerThreads(); - else - nThreads = GetNumCores(); - } + if (nThreads < 0) + nThreads = GetNumCores(); if (minerThreads != NULL) { |