From eb0d9ecb6e206bcfdf9a2eb6157fb8030046980f Mon Sep 17 00:00:00 2001
From: Cozz Lovan <cozzlovan@yahoo.com>
Date: Sun, 2 Feb 2014 01:59:57 +0100
Subject: [Qt] Fix nTransactionFee in qt-settings

---
 src/qt/optionsmodel.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/qt/optionsmodel.cpp')

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"))
-- 
cgit v1.2.3