When using Qt GUI, move parameter-parsing to start of qt/bitcoin.cpp:main()
This commit is contained in:
parent
8848a70ba1
commit
4dba26620c
@ -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"))
|
||||
{
|
||||
|
@ -118,6 +118,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
|
||||
|
Loading…
Reference in New Issue
Block a user