diff options
| author | practicalswift <[email protected]> | 2018-07-31 07:32:47 +0200 |
|---|---|---|
| committer | practicalswift <[email protected]> | 2018-11-05 16:52:59 +0100 |
| commit | 7c5bc2a52388522eccd3090e9473d4b627980672 (patch) | |
| tree | 24469d06068595d8356b64007b411a5fb1fb06ca | |
| parent | Merge #14632: Tests: Fix a comment (diff) | |
| download | discoin-7c5bc2a52388522eccd3090e9473d4b627980672.tar.xz discoin-7c5bc2a52388522eccd3090e9473d4b627980672.zip | |
miner: Default to DEFAULT_BLOCK_MIN_TX_FEE if unable to parse -blockmintxfee
| -rw-r--r-- | src/miner.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index feb86cab6..96c9cd6d2 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -70,9 +70,8 @@ static BlockAssembler::Options DefaultOptions() // If -blockmaxweight is not given, limit to DEFAULT_BLOCK_MAX_WEIGHT BlockAssembler::Options options; options.nBlockMaxWeight = gArgs.GetArg("-blockmaxweight", DEFAULT_BLOCK_MAX_WEIGHT); - if (gArgs.IsArgSet("-blockmintxfee")) { - CAmount n = 0; - ParseMoney(gArgs.GetArg("-blockmintxfee", ""), n); + CAmount n = 0; + if (gArgs.IsArgSet("-blockmintxfee") && ParseMoney(gArgs.GetArg("-blockmintxfee", ""), n)) { options.blockMinFeeRate = CFeeRate(n); } else { options.blockMinFeeRate = CFeeRate(DEFAULT_BLOCK_MIN_TX_FEE); |