DragonX/hush3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Auto merge of #1863 - str4d:1795-config-flag-disable-miner, r=bitcartel

Browse Source 
Add compile flag to disable compilation of mining code

Closes #1795
This commit is contained in:
zkbot
2017-02-09 17:43:43 +00:00
parent 904c19dca6 2cc0a252ad
commit 80a32b2845
15 changed files with 107 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/init.cpp
View File

@@ -163,7 +163,9 @@ void Shutdown()
#ifdef ENABLE_WALLET
if (pwalletMain)
pwalletMain->Flush(false);
#ifdef ENABLE_MINING
GenerateBitcoins(false, NULL, 0);
#endif
#endif
StopNode();
UnregisterNodeSignals(GetNodeSignals());
@@ -1505,7 +1507,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
boost::ref(cs_main), boost::cref(pindexBestHeader), nPowTargetSpacing);
scheduler.scheduleEvery(f, nPowTargetSpacing);
#ifdef ENABLE_WALLET
#if defined(ENABLE_WALLET) && defined(ENABLE_MINING)
// Generate coins in the background
if (pwalletMain)
GenerateBitcoins(GetBoolArg("-gen", false), pwalletMain, GetArg("-genproclimit", 1));