aboutsummaryrefslogtreecommitdiff
path: root/src/qt/optionsmodel.cpp
diff options
context:
space:
mode:
authorCozz Lovan <cozzlovan@yahoo.com>2014-02-02 01:59:57 +0100
committerCozz Lovan <cozzlovan@yahoo.com>2014-02-02 01:59:57 +0100
commiteb0d9ecb6e206bcfdf9a2eb6157fb8030046980f (patch)
treeb98e66921d5ccaa98811e46e871a6f96129b4e69 /src/qt/optionsmodel.cpp
parent15ec451554b5889a92651b9fe71bf01047ba9fc3 (diff)
downloadbitcoin-eb0d9ecb6e206bcfdf9a2eb6157fb8030046980f.tar.xz
[Qt] Fix nTransactionFee in qt-settings
Diffstat (limited to 'src/qt/optionsmodel.cpp')
-rw-r--r--src/qt/optionsmodel.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index a18fd1d514..c1dbd916b3 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -73,6 +73,9 @@ void OptionsModel::Init()
#ifdef ENABLE_WALLET
if (!settings.contains("nTransactionFee"))
settings.setValue("nTransactionFee", 0);
+ nTransactionFee = settings.value("nTransactionFee").toLongLong(); // if -paytxfee is set, this will be overridden later in init.cpp
+ if (mapArgs.count("-paytxfee"))
+ strOverriddenByCommandLine += "-paytxfee ";
#endif
if (!settings.contains("nDatabaseCache"))