twisterarmy/twister-core
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-core.git synced 2025-01-22 20:44:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #690 from runeksvendsen/qt-cmdline-options-parsing

Browse Source 
When using Qt GUI, move parameter-parsing to start of qt/bitcoin.cpp:main()
This commit is contained in:
Gavin Andresen 2011-12-19 12:23:00 -08:00
commit 3528650560
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/init.cpp
View File

@ -148,7 +148,10 @@ bool AppInit2(int argc, char* argv[])
//
// Parameters
//
// If Qt is used, parameters are parsed in qt/bitcoin.cpp's main()
#if !defined(QT_GUI)
ParseParameters(argc, argv);
#endif
if (mapArgs.count("-datadir"))
{

2
src/qt/bitcoin.cpp
View File

@ -120,6 +120,8 @@ int main(int argc, char *argv[])
Q_INIT_RESOURCE(bitcoin);
QApplication app(argc, argv);
ParseParameters(argc, argv);
// Load language files for system locale:
// - First load the translator for the base language, without territory
// - Then load the more specific locale translator