mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-26 19:23:26 -03:00
When using Qt GUI, move parameter-parsing to start of qt/bitcoin.cpp:main()
This commit is contained in:
parent
8848a70ba1
commit
4dba26620c
2 changed files with 5 additions and 0 deletions
|
@ -148,7 +148,10 @@ bool AppInit2(int argc, char* argv[])
|
||||||
//
|
//
|
||||||
// Parameters
|
// Parameters
|
||||||
//
|
//
|
||||||
|
// If Qt is used, parameters are parsed in qt/bitcoin.cpp's main()
|
||||||
|
#if !defined(QT_GUI)
|
||||||
ParseParameters(argc, argv);
|
ParseParameters(argc, argv);
|
||||||
|
#endif
|
||||||
|
|
||||||
if (mapArgs.count("-datadir"))
|
if (mapArgs.count("-datadir"))
|
||||||
{
|
{
|
||||||
|
|
|
@ -118,6 +118,8 @@ int main(int argc, char *argv[])
|
||||||
Q_INIT_RESOURCE(bitcoin);
|
Q_INIT_RESOURCE(bitcoin);
|
||||||
QApplication app(argc, argv);
|
QApplication app(argc, argv);
|
||||||
|
|
||||||
|
ParseParameters(argc, argv);
|
||||||
|
|
||||||
// Load language files for system locale:
|
// Load language files for system locale:
|
||||||
// - First load the translator for the base language, without territory
|
// - First load the translator for the base language, without territory
|
||||||
// - Then load the more specific locale translator
|
// - Then load the more specific locale translator
|
||||||
|
|
Loading…
Add table
Reference in a new issue