highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-12-18 08:32:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent 483e8e4f48 fa5d276c90
commit a5b20edd3d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/init.cpp
View File

@@ -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