[Qt] Fix nTransactionFee in qt-settings

2014-02-02 01:59:57 +01:00 · 2014-02-02 01:59:57 +01:00 · eb0d9ecb6e
parent 15ec451554
commit eb0d9ecb6e
1 changed files with 3 additions and 0 deletions
--- 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"))