Mercurial > hg > bitcoin

changeset 1591:f9117d13e533 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge pull request #690 from runeksvendsen/qt-cmdline-options-parsing When using Qt GUI, move parameter-parsing to start of qt/bitcoin.cpp:main()
author Gavin Andresen <gavinandresen@gmail.com>
date Mon, 19 Dec 2011 12:23:00 -0800
parents 820c00b48391 (current diff) 0d3aef569e08 (diff)
children fb1b855c0484 3a0e9ed784d4 b211b5082e8a
files src/init.cpp src/qt/bitcoin.cpp
diffstat 2 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -148,7 +148,10 @@
     //
     // 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"))
     {
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -120,6 +120,8 @@
     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