Load theConfig before initializing Application.

This commit is contained in:
Arthur Britto
2012-04-28 15:13:32 -07:00
parent 21f6dd1f87
commit 67e34a1594
2 changed files with 6 additions and 2 deletions

View File

@@ -11,6 +11,7 @@
#include "RPCDoor.h" #include "RPCDoor.h"
#include "BitcoinUtil.h" #include "BitcoinUtil.h"
#include "key.h" #include "key.h"
#include "utils.h"
Application* theApp=NULL; Application* theApp=NULL;
@@ -45,7 +46,7 @@ Application::Application() :
mTxnDB(NULL), mLedgerDB(NULL), mWalletDB(NULL), mHashNodeDB(NULL), mNetNodeDB(NULL), mTxnDB(NULL), mLedgerDB(NULL), mWalletDB(NULL), mHashNodeDB(NULL), mNetNodeDB(NULL),
mPeerDoor(NULL), mRPCDoor(NULL) mPeerDoor(NULL), mRPCDoor(NULL)
{ {
theConfig.load(); nothing();
} }
extern const char *TxnDBInit[], *LedgerDBInit[], *WalletDBInit[], *HashNodeDBInit[], *NetNodeDBInit[]; extern const char *TxnDBInit[], *LedgerDBInit[], *WalletDBInit[], *HashNodeDBInit[], *NetNodeDBInit[];

View File

@@ -47,14 +47,17 @@ void printHelp()
int parseCommandline(int argc, char* argv[]) int parseCommandline(int argc, char* argv[])
{ {
int ret=0; int ret=0;
theConfig.load();
if(argc>1) if(argc>1)
{ {
theConfig.load();
ret=commandLineRPC(argc, argv); ret=commandLineRPC(argc, argv);
if(ret) if(ret)
printHelp(); printHelp();
} }
else startApp(); else startApp();
return ret; return ret;
} }