[Qt] Fix nTransactionFee in qt-settings

bitcoin · Feb 2, 2014 · eb0d9ec · eb0d9ec
1 parent 15ec451
commit eb0d9ec
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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"))