diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-19 11:38:10 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-19 11:38:16 +0200 |
| commit | a5b20edd3dc678949db4605025a3e0dd747124c2 (patch) | |
| tree | 337f6e2b014c4e0770a7545715c19d0f987a388f | |
| parent | 483e8e4f4875a1a621ec9e9df2880d3037d95ed7 (diff) | |
| parent | fa5d276c906214ef959529fd6cde0b78bd67ed8e (diff) | |
| download | bitcoin-a5b20edd3dc678949db4605025a3e0dd747124c2.tar.xz | |
Merge #8494: [init, wallet] ParameterInteraction() iff wallet enabled
fa5d276 [init] ParameterInteraction() iff wallet enabled (MarcoFalke)
| -rw-r--r-- | src/init.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp index 8d1e330a05..32b1719258 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -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 |