diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-02-03 23:42:23 -0800 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-02-03 23:42:23 -0800 |
| commit | f30fbbfbd69b39dfbf770b997e2809303c935868 (patch) | |
| tree | 53d5e456115239a652e1e0e2285b9810f98c34aa | |
| parent | 985a94101c640fe8c86503d8d90dc7418d36b8e4 (diff) | |
| parent | eb0d9ecb6e206bcfdf9a2eb6157fb8030046980f (diff) | |
| download | bitcoin-f30fbbfbd69b39dfbf770b997e2809303c935868.tar.xz | |
Merge pull request #3613 from cozz/cozz1
[Qt] Fix nTransactionFee in qt-settings
| -rw-r--r-- | src/qt/optionsmodel.cpp | 3 |
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")) |