Merge #7509: Common argument defaults for NODE_BLOOM stuff and -wallet

1fb91b3 Common argument defaults for NODE_BLOOM stuff and -wallet (Luke Dashjr)
2016-02-16 09:47:45 +01:00
parent ce5fc02e61 1fb91b3496
commit 2d4f73f47e
3 changed files with 11 additions and 6 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4374,7 +4374,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
        if (pfrom->nVersion >= NO_BLOOM_VERSION) {
            Misbehaving(pfrom->GetId(), 100);
            return false;
-        } else if (GetBoolArg("-enforcenodebloom", false)) {
+        } else if (GetBoolArg("-enforcenodebloom", DEFAULT_ENFORCENODEBLOOM)) {
            pfrom->fDisconnect = true;
            return false;
        }