Merge bitcoin#13815: Default to DEFAULT_BLOCK_MIN_TX_FEE if unable to…

… parse arg bitcoin@7c5bc2a
kwvg · Mar 10, 2021 · bf3997c · bf3997c
1 parent c6f3970
commit bf3997c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -83,7 +83,7 @@ static BlockAssembler::Options DefaultOptions(const CChainParams& params)
     if (gArgs.IsArgSet("-blockmaxsize")) {
         options.nBlockMaxSize = gArgs.GetArg("-blockmaxsize", DEFAULT_BLOCK_MAX_SIZE);
     }
-    if (gArgs.IsArgSet("-blockmintxfee")) {
+    if (gArgs.IsArgSet("-blockmintxfee") && ParseMoney(gArgs.GetArg("-blockmintxfee", ""), n)) {
         CAmount n = 0;
         ParseMoney(gArgs.GetArg("-blockmintxfee", ""), n);
         options.blockMinFeeRate = CFeeRate(n);