diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-10-03 13:16:40 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-10-03 15:25:09 +0200 |
| commit | a7e5cbb209d4aeb8c2e4c58c92bf214759998056 (patch) | |
| tree | 4f0885ed50a46481db455943f5ea6bdb332a61ec /src/bitcoind.cpp | |
| parent | Merge #8860: [qa] util: Move wait_bitcoinds() into stop_nodes() (diff) | |
| parent | Globals: Decouple GetConfigFile and ReadConfigFile from global mapArgs (diff) | |
| download | discoin-a7e5cbb209d4aeb8c2e4c58c92bf214759998056.tar.xz discoin-a7e5cbb209d4aeb8c2e4c58c92bf214759998056.zip | |
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/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 25d720e1e..351463c25 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; |