diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2013-04-02 08:56:57 -0700 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-04-02 08:56:57 -0700 |
| commit | 06db61f09e4201a17ef169754ac374a2b7a37316 (patch) | |
| tree | d1926a75ffb53fb36aa935a3e3fa01e6053b0613 | |
| parent | bcce45e9b012e4efc6a72dae09bc86f75086fed7 (diff) | |
| parent | a0cafb7945cb81616586fa82a1419d826f9a2c6e (diff) | |
| download | bitcoin-06db61f09e4201a17ef169754ac374a2b7a37316.tar.xz | |
Merge pull request #2431 from jgarzik/gen-bitcoins-init
Move GenerateBitcoins() call out of net.cpp's StartNode()
| -rw-r--r-- | src/init.cpp | 3 | ||||
| -rw-r--r-- | src/net.cpp | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/init.cpp b/src/init.cpp index bb22b1d246..aac46d489d 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1027,6 +1027,9 @@ bool AppInit2() if (fServer) NewThread(ThreadRPCServer, NULL); + // Generate coins in the background + GenerateBitcoins(GetBoolArg("-gen", false), pwalletMain); + // ********************************************************* Step 12: finished uiInterface.InitMessage(_("Done loading")); diff --git a/src/net.cpp b/src/net.cpp index 9ee6cb423c..6f3c8a51ae 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -2047,9 +2047,6 @@ void StartNode(void* parg) // Dump network addresses if (!NewThread(ThreadDumpAddress, NULL)) printf("Error; NewThread(ThreadDumpAddress) failed\n"); - - // Generate coins in the background - GenerateBitcoins(GetBoolArg("-gen", false), pwalletMain); } bool StopNode() |