highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-12 15:09:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reworked QT settings

Browse Source
This commit is contained in:
Gavin Andresen
2012-02-16 21:09:41 -05:00
committed by Pieter Wuille
parent 972060ce0e
commit 3f8cb2c565
6 changed files with 153 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/init.cpp
View File

@@ -150,27 +150,15 @@ bool AppInit2(int argc, char* argv[])
//
// Parameters
//
// If Qt is used, parameters are parsed in qt/bitcoin.cpp's main()
// If Qt is used, parameters/bitcoin.conf are parsed in qt/bitcoin.cpp's main()
#if !defined(QT_GUI)
ParseParameters(argc, argv);
#endif
if (mapArgs.count("-datadir"))
if (!ReadConfigFile(mapArgs, mapMultiArgs))
{
if (filesystem::is_directory(filesystem::system_complete(mapArgs["-datadir"])))
{
filesystem::path pathDataDir = filesystem::system_complete(mapArgs["-datadir"]);
strlcpy(pszSetDataDir, pathDataDir.string().c_str(), sizeof(pszSetDataDir));
}
else
{
fprintf(stderr, "Error: Specified directory does not exist\n");
Shutdown(NULL);
}
fprintf(stderr, "Error: Specified directory does not exist\n");
Shutdown(NULL);
}
ReadConfigFile(mapArgs, mapMultiArgs); // Must be done after processing datadir
#endif
if (mapArgs.count("-?") || mapArgs.count("--help"))
{