diff options
| author | Jorge Timón <jtimon@jtimon.cc> | 2016-09-28 10:10:15 +0200 |
|---|---|---|
| committer | Jorge Timón <jtimon@jtimon.cc> | 2016-10-01 08:12:19 +0200 |
| commit | 3450c18a125f125aec76bfef79c69317eaad935d (patch) | |
| tree | d41fdcefaab3cc63947a22d3960b22107cbb35f8 /src/bitcoind.cpp | |
| parent | 7b784cc2bbcdc90361add2adb657c58162aca4ef (diff) | |
| download | bitcoin-3450c18a125f125aec76bfef79c69317eaad935d.tar.xz | |
Globals: Decouple GetConfigFile and ReadConfigFile from global mapArgs
Diffstat (limited to 'src/bitcoind.cpp')
| -rw-r--r-- | src/bitcoind.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index 25d720e1e8..351463c256 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -104,7 +104,7 @@ bool AppInit(int argc, char* argv[]) } try { - ReadConfigFile(mapArgs, mapMultiArgs); + ReadConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME), mapArgs, mapMultiArgs); } catch (const std::exception& e) { fprintf(stderr,"Error reading configuration file: %s\n", e.what()); return false; |