highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 06:28:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6370

Browse Source 
6ebac07 Remove ChainParams::DefaultMinerThreads (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan
2015-07-10 17:12:09 +02:00
parent c52e8b300a 6ebac0782f
commit fac21df5f0
3 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/miner.cpp
View File

@@ -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)
{