From 67e34a15941f090befa1ae71a1af222afd5113ee Mon Sep 17 00:00:00 2001 From: Arthur Britto Date: Sat, 28 Apr 2012 15:13:32 -0700 Subject: [PATCH] Load theConfig before initializing Application. --- src/Application.cpp | 3 ++- src/main.cpp | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Application.cpp b/src/Application.cpp index ccd2ca404..7c097cb26 100644 --- a/src/Application.cpp +++ b/src/Application.cpp @@ -11,6 +11,7 @@ #include "RPCDoor.h" #include "BitcoinUtil.h" #include "key.h" +#include "utils.h" Application* theApp=NULL; @@ -45,7 +46,7 @@ Application::Application() : mTxnDB(NULL), mLedgerDB(NULL), mWalletDB(NULL), mHashNodeDB(NULL), mNetNodeDB(NULL), mPeerDoor(NULL), mRPCDoor(NULL) { - theConfig.load(); + nothing(); } extern const char *TxnDBInit[], *LedgerDBInit[], *WalletDBInit[], *HashNodeDBInit[], *NetNodeDBInit[]; diff --git a/src/main.cpp b/src/main.cpp index dbb7c3e05..2d8721909 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -47,14 +47,17 @@ void printHelp() int parseCommandline(int argc, char* argv[]) { int ret=0; + + theConfig.load(); + if(argc>1) { - theConfig.load(); ret=commandLineRPC(argc, argv); if(ret) printHelp(); } else startApp(); + return ret; }