diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-02-11 22:14:04 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-02-11 22:14:13 +0100 |
| commit | 19e5b9d2dfcac4efadba636745485d9660fb1abe (patch) | |
| tree | 9389a122047da512c3545337bd278c06f72b0c3c /src/init.cpp | |
| parent | Merge pull request #3025 from sipa/noncanpush (diff) | |
| parent | Add option to avoid spending unconfirmed change (diff) | |
| download | discoin-19e5b9d2dfcac4efadba636745485d9660fb1abe.tar.xz discoin-19e5b9d2dfcac4efadba636745485d9660fb1abe.zip | |
Merge pull request #3651
1bbca24 Add option to avoid spending unconfirmed change (Wladimir J. van der Laan)
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/init.cpp b/src/init.cpp index 4d16f4696..12fb12907 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -274,6 +274,7 @@ std::string HelpMessage(HelpMessageMode hmm) strUsage += " -upgradewallet " + _("Upgrade wallet to latest format") + "\n"; strUsage += " -wallet=<file> " + _("Specify wallet file (within data directory)") + "\n"; strUsage += " -walletnotify=<cmd> " + _("Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)") + "\n"; + strUsage += " -spendzeroconfchange " + _("Spend unconfirmed change when sending transactions (default: 1)") + "\n"; #endif strUsage += "\n" + _("Block creation options:") + "\n"; strUsage += " -blockminsize=<n> " + _("Set minimum block size in bytes (default: 0)") + "\n"; @@ -539,6 +540,7 @@ bool AppInit2(boost::thread_group& threadGroup) if (nTransactionFee > 0.25 * COIN) InitWarning(_("Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.")); } + bSpendZeroConfChange = GetArg("-spendzeroconfchange", true); strWalletFile = GetArg("-wallet", "wallet.dat"); #endif |