diff options
| author | John Newbery <john@johnnewbery.com> | 2017-07-14 18:17:27 -0400 |
|---|---|---|
| committer | John Newbery <john@johnnewbery.com> | 2017-07-15 15:31:26 -0400 |
| commit | 4c3b538c61532dc68d79bbe34729759a13b73f0c (patch) | |
| tree | ca9d0e5be4244f6df3da3146613219fa23d0b795 /src/wallet | |
| parent | e7a2181b49774f2cc29839ebbdc206bcdb715a7f (diff) | |
| download | bitcoin-4c3b538c61532dc68d79bbe34729759a13b73f0c.tar.xz | |
[logs] fix zapwallettxes startup logs
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 4366428f5c..7aa2e31743 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -4043,18 +4043,19 @@ bool CWallet::ParameterInteraction() } } - // -zapwallettx implies dropping the mempool on startup - if (GetBoolArg("-zapwallettxes", false) && SoftSetBoolArg("-persistmempool", false)) { - LogPrintf("%s: parameter interaction: -zapwallettxes=<mode> -> setting -persistmempool=0\n", __func__); + int zapwallettxes = GetArg("-zapwallettxes", 0); + // -zapwallettxes implies dropping the mempool on startup + if (zapwallettxes != 0 && SoftSetBoolArg("-persistmempool", false)) { + LogPrintf("%s: parameter interaction: -zapwallettxes=%s -> setting -persistmempool=0\n", __func__, zapwallettxes); } - // -zapwallettx implies a rescan - if (GetBoolArg("-zapwallettxes", false)) { + // -zapwallettxes implies a rescan + if (zapwallettxes != 0) { if (is_multiwallet) { return InitError(strprintf("%s is only allowed with a single wallet file", "-zapwallettxes")); } if (SoftSetBoolArg("-rescan", true)) { - LogPrintf("%s: parameter interaction: -zapwallettxes=<mode> -> setting -rescan=1\n", __func__); + LogPrintf("%s: parameter interaction: -zapwallettxes=%s -> setting -rescan=1\n", __func__, zapwallettxes); } } |