From 4dba26620cf1015b8e980ce3e401d15c64e1169d Mon Sep 17 00:00:00 2001
From: Rune K Svendsen <runesvend@gmail.com>
Date: Fri, 9 Dec 2011 19:19:27 +0100
Subject: [PATCH] When using Qt GUI, move parameter-parsing to start of
 qt/bitcoin.cpp:main()

---
 src/init.cpp       | 3 +++
 src/qt/bitcoin.cpp | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/init.cpp b/src/init.cpp
index dd8bdf559..291510fc2 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -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"))
     {
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 4aaad6bd2..808a9f46b 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -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