Browse Source

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

When using Qt GUI, move parameter-parsing to start of qt/bitcoin.cpp:main()
0.8
Gavin Andresen 13 years ago
parent
commit
3528650560
  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[]) @@ -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

@ -120,6 +120,8 @@ int main(int argc, char *argv[]) @@ -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

Loading…
Cancel
Save