Browse Source

When using Qt GUI, move parameter-parsing to start of qt/bitcoin.cpp:main()

0.8
Rune K Svendsen 13 years ago
parent
commit
4dba26620c
  1. 3
      src/init.cpp
  2. 2
      src/qt/bitcoin.cpp

3
src/init.cpp

@ -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"))
{ {

2
src/qt/bitcoin.cpp

@ -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…
Cancel
Save