diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-02-03 23:42:23 -0800 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-02-03 23:42:23 -0800 |
| commit | f30fbbfbd69b39dfbf770b997e2809303c935868 (patch) | |
| tree | 53d5e456115239a652e1e0e2285b9810f98c34aa /src/qt/optionsmodel.cpp | |
| parent | Merge pull request #3621 from gubatron/build-osx-qt-dependency-missing (diff) | |
| parent | [Qt] Fix nTransactionFee in qt-settings (diff) | |
| download | discoin-f30fbbfbd69b39dfbf770b997e2809303c935868.tar.xz discoin-f30fbbfbd69b39dfbf770b997e2809303c935868.zip | |
Merge pull request #3613 from cozz/cozz1
[Qt] Fix nTransactionFee in qt-settings
Diffstat (limited to 'src/qt/optionsmodel.cpp')
| -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 a18fd1d51..c1dbd916b 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")) |