Merge pull request #2716 from laanwj/2013_05_30_getwork

Move pMiningKey init out of StartRPCThreads
This commit is contained in:
Jeff Garzik
2013-05-30 09:15:16 -07:00
4 changed files with 21 additions and 10 deletions

View File

@@ -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();