Merge #7307: [RPC, Wallet] Move RPC dispatch table registration to wallet/ code

dd2dc40 [RPC, Wallet] Move RPC dispatch table registration to wallet/ code (Jonas Schnelli)
This commit is contained in:
Wladimir J. van der Laan 2016-01-20 15:15:29 +01:00
commit 9982710e88
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
8 changed files with 106 additions and 93 deletions

View file

@ -935,6 +935,8 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
#ifdef ENABLE_WALLET
bool fDisableWallet = GetBoolArg("-disablewallet", false);
if (!fDisableWallet)
walletRegisterRPCCommands();
#endif
nConnectTimeout = GetArg("-timeout", DEFAULT_CONNECT_TIMEOUT);