aboutsummaryrefslogtreecommitdiff
path: root/src/qt
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-05-08 10:40:49 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-05-08 10:48:07 +0200
commit0ecd8aae203f87850672d4cd1166dfd77e4aeb72 (patch)
tree05839997b0375e825057c7e6a7dcaf04ddf526e6 /src/qt
parent69e264b6f80013595f6e7669947856b5432bdf6e (diff)
parent3e1cf9b6f68bac2456258ea7b12f2342c760a223 (diff)
Merge pull request #4131
3e1cf9b add DEFAULT_TRANSACTION_FEE constant in wallet (Philip Kaufmann)
Diffstat (limited to 'src/qt')
-rw-r--r--src/qt/optionsmodel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 74c6b10ce2..d024af73c8 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -93,7 +93,7 @@ void OptionsModel::Init()
// Wallet
#ifdef ENABLE_WALLET
if (!settings.contains("nTransactionFee"))
- settings.setValue("nTransactionFee", 0);
+ settings.setValue("nTransactionFee", DEFAULT_TRANSACTION_FEE);
nTransactionFee = settings.value("nTransactionFee").toLongLong(); // if -paytxfee is set, this will be overridden later in init.cpp
if (mapArgs.count("-paytxfee"))
addOverriddenOption("-paytxfee");