Merge #8494: [init, wallet] ParameterInteraction() iff wallet enabled
fa5d276
[init] ParameterInteraction() iff wallet enabled (MarcoFalke)
This commit is contained in:
commit
a5b20edd3d
1 changed files with 1 additions and 1 deletions
|
@ -978,7 +978,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
|
||||||
nBytesPerSigOp = GetArg("-bytespersigop", nBytesPerSigOp);
|
nBytesPerSigOp = GetArg("-bytespersigop", nBytesPerSigOp);
|
||||||
|
|
||||||
#ifdef ENABLE_WALLET
|
#ifdef ENABLE_WALLET
|
||||||
if (!CWallet::ParameterInteraction())
|
if (!fDisableWallet && !CWallet::ParameterInteraction())
|
||||||
return false;
|
return false;
|
||||||
#endif // ENABLE_WALLET
|
#endif // ENABLE_WALLET
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue