Merge #8494: [init, wallet] ParameterInteraction() iff wallet enabled

fa5d276 [init] ParameterInteraction() iff wallet enabled (MarcoFalke)
This commit is contained in:
Wladimir J. van der Laan 2016-09-19 11:38:10 +02:00
commit a5b20edd3d
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6

View File

@ -978,7 +978,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
nBytesPerSigOp = GetArg("-bytespersigop", nBytesPerSigOp);
#ifdef ENABLE_WALLET
if (!CWallet::ParameterInteraction())
if (!fDisableWallet && !CWallet::ParameterInteraction())
return false;
#endif // ENABLE_WALLET