diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-10-03 13:16:40 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-10-03 15:25:09 +0200 |
| commit | a7e5cbb209d4aeb8c2e4c58c92bf214759998056 (patch) | |
| tree | 4f0885ed50a46481db455943f5ea6bdb332a61ec /src/qt/bitcoin.cpp | |
| parent | 76f3c02fb01a6df98fbd8c16ac21d159d4649d37 (diff) | |
| parent | 3450c18a125f125aec76bfef79c69317eaad935d (diff) | |
| download | bitcoin-a7e5cbb209d4aeb8c2e4c58c92bf214759998056.tar.xz | |
Merge #8856: Globals: Decouple GetConfigFile and ReadConfigFile from global mapArgs
3450c18 Globals: Decouple GetConfigFile and ReadConfigFile from global mapArgs (Jorge Timón)
Diffstat (limited to 'src/qt/bitcoin.cpp')
| -rw-r--r-- | src/qt/bitcoin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 430e6dd0e8..9986af4957 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -590,7 +590,7 @@ int main(int argc, char *argv[]) return 1; } try { - ReadConfigFile(mapArgs, mapMultiArgs); + ReadConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME), mapArgs, mapMultiArgs); } catch (const std::exception& e) { QMessageBox::critical(0, QObject::tr(PACKAGE_NAME), QObject::tr("Error: Cannot parse configuration file: %1. Only use key=value syntax.").arg(e.what())); |