highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-12-18 16:42:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Globals: Decouple GetConfigFile and ReadConfigFile from global mapArgs

Browse Source
This commit is contained in:
Jorge Timón
2016-09-28 10:10:15 +02:00
parent 7b784cc2bb
commit 3450c18a12
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/bitcoin.cpp
View File

@@ -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()));