diff options
| author | Karl-Johan Alm <[email protected]> | 2018-04-18 14:35:44 +0900 |
|---|---|---|
| committer | Karl-Johan Alm <[email protected]> | 2018-04-26 12:46:28 +0900 |
| commit | 629ff8c35845af95c95e24cfdda25f9991f95ae5 (patch) | |
| tree | 9c2cfc75b67631be7c21cb19a81fe63d750edf03 /src/qt/bitcoin.cpp | |
| parent | Merge #13013: bench: Amend mempool_eviction test for witness txs (diff) | |
| download | discoin-629ff8c35845af95c95e24cfdda25f9991f95ae5.tar.xz discoin-629ff8c35845af95c95e24cfdda25f9991f95ae5.zip | |
-includeconf=<path> support in config handler, for including external configuration files
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 57fe4552a..c0fb641b1 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -616,7 +616,7 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; } try { - node->readConfigFile(gArgs.GetArg("-conf", BITCOIN_CONF_FILENAME)); + node->readConfigFiles(); } 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())); |