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

fa5d276 [init] ParameterInteraction() iff wallet enabled (MarcoFalke)
2016-09-19 11:38:10 +02:00 · 2016-09-19 11:38:10 +02:00 · a5b20edd3d
parent 483e8e4f48 fa5d276c90
commit a5b20edd3d
1 changed files with 1 additions and 1 deletions
--- 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