diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2013-12-09 19:36:39 -0800 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-12-09 19:36:39 -0800 |
| commit | d47bbbd2619910f197967e8a8e54ac5ccdfae338 (patch) | |
| tree | d2337ab5a7ac78bc34ad03d8fc03234ebeff697d /src/init.cpp | |
| parent | 955787f83f49dab298763a3a119766494dede30f (diff) | |
| parent | fbc7a96d03200e55021c9e04f7fa9114272e6960 (diff) | |
| download | bitcoin-d47bbbd2619910f197967e8a8e54ac5ccdfae338.tar.xz | |
Merge pull request #3368 from laanwj/2013_11_disable_wallet_mining
Allow mining RPCs with --disable-wallet
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/init.cpp b/src/init.cpp index df3cedc202..b835911df3 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -113,8 +113,8 @@ void Shutdown() RenameThread("bitcoin-shutoff"); mempool.AddTransactionsUpdated(1); StopRPCThreads(); -#ifdef ENABLE_WALLET ShutdownRPCMining(); +#ifdef ENABLE_WALLET if (pwalletMain) bitdb.Flush(false); GenerateBitcoins(false, NULL, 0); @@ -1042,10 +1042,8 @@ bool AppInit2(boost::thread_group& threadGroup, bool fForceServer) #endif StartNode(threadGroup); -#ifdef ENABLE_WALLET // InitRPCMining is needed here so getwork/getblocktemplate in the GUI debug console works properly. InitRPCMining(); -#endif if (fServer) StartRPCThreads(); |