diff options
author | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> | 2010-05-26 00:05:26 +0000 |
---|---|---|
committer | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> | 2010-05-26 00:05:26 +0000 |
commit | 7a47324c7846ab0e500b974cd1f40e4030a7c0d2 (patch) | |
tree | 4b2b30223b78d51882769886945c63f5427a812b /init.cpp | |
parent | 9c1e9f0b6a1d073a5f450c847850ef1d8df74137 (diff) | |
download | bitcoin-7a47324c7846ab0e500b974cd1f40e4030a7c0d2.tar.xz |
better prevention of inventory relaying during initial download,
message checksum between nodes with 0.2.9 or higher,
optimization level up from -O0 to -O2,
rpc functions: setlabel, getlabel, getaddressesbylabel, getreceivedbyaddress, getreceivedbylabel, listreceivedbyaddress, listreceivedbylabel
-- version 0.2.9
Diffstat (limited to 'init.cpp')
-rw-r--r-- | init.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -224,9 +224,6 @@ bool CMyApp::Initialize(int& argc, wxChar** argv) }
}
- if (fDaemon)
- fprintf(stdout, "bitcoin server starting\n");
-
#ifdef __WXGTK__
if (fDaemon || fCommandLine)
{
@@ -447,7 +444,8 @@ bool CMyApp::OnInit2() //
// Load data files
//
- bool fFirstRun;
+ if (fDaemon)
+ fprintf(stdout, "bitcoin server starting\n");
strErrors = "";
int64 nStart;
@@ -465,6 +463,7 @@ bool CMyApp::OnInit2() printf("Loading wallet...\n");
nStart = GetTimeMillis();
+ bool fFirstRun;
if (!LoadWallet(fFirstRun))
strErrors += _("Error loading wallet.dat \n");
printf(" wallet %15"PRI64d"ms\n", GetTimeMillis() - nStart);
|