aboutsummaryrefslogtreecommitdiff
path: root/src/init.cpp
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@bitpay.com>2013-05-30 09:15:16 -0700
committerJeff Garzik <jgarzik@bitpay.com>2013-05-30 09:15:16 -0700
commit6bc6d57303e1c9d469d31a43da83f944a53ab549 (patch)
treec8cd9fade7925a8065bbaf6c0972f8b8d8e7d804 /src/init.cpp
parent87ec1929cf74bf13fa008c70cdf4ac3765efade0 (diff)
parentd98bf10f23e0e633ff2ff33075a353d30bf862b4 (diff)
Merge pull request #2716 from laanwj/2013_05_30_getwork
Move pMiningKey init out of StartRPCThreads
Diffstat (limited to 'src/init.cpp')
-rw-r--r--src/init.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/init.cpp b/src/init.cpp
index aaa7d43203..226e93e9a5 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -97,6 +97,7 @@ void Shutdown()
RenameThread("bitcoin-shutoff");
nTransactionsUpdated++;
StopRPCThreads();
+ ShutdownRPCMining();
bitdb.Flush(false);
StopNode();
{
@@ -1088,6 +1089,8 @@ bool AppInit2(boost::thread_group& threadGroup)
StartNode(threadGroup);
+ // InitRPCMining is needed here so getwork/getblocktemplate in the GUI debug console works properly.
+ InitRPCMining();
if (fServer)
StartRPCThreads();