aboutsummaryrefslogtreecommitdiff
path: root/src/qt/paymentserver.h
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-01-05 12:37:51 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2014-01-05 12:55:03 +0100
commit2102ab9f5cb542e6727e0f25e670d8549aa1bf1a (patch)
treecad487646827981bacb34d1d102c143eb6e858f8 /src/qt/paymentserver.h
parent16403b42759205461918c652fdc5b71c422c44a2 (diff)
ui: Fix GUI initialization order
Fixes at least #3478. Splits and documents the phases: 1. Parse command-line options. These take precedence over anything else. 2. Basic Qt initialization (not dependent on parameters or configuration) 3. Application identification 4. Initialization of translations 5. Now that settings and translations are available, ask user for data directory 6. Determine availability of data directory and parse bitcoin.conf 7. URI IPC sending 8. Main GUI initialization Splits command line parsing logic from ipcSendCommandLine into ipcParseCommandLine, as isTestNet() can only be overridden in the early stages before choosing a data directory. Sending however needs to happen after choosing a data directory.
Diffstat (limited to 'src/qt/paymentserver.h')
-rw-r--r--src/qt/paymentserver.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h
index ab59388acc..5ee85f7db4 100644
--- a/src/qt/paymentserver.h
+++ b/src/qt/paymentserver.h
@@ -56,12 +56,16 @@ class PaymentServer : public QObject
Q_OBJECT
public:
+ // Parse URIs on command line
+ // Returns false on error
+ static bool ipcParseCommandLine(int argc, char *argv[]);
+
// Returns true if there were URIs on the command line
// which were successfully sent to an already-running
// process.
// Note: if a payment request is given, SelectParams(MAIN/TESTNET)
// will be called so we startup in the right mode.
- static bool ipcSendCommandLine(int argc, char *argv[]);
+ static bool ipcSendCommandLine();
// parent should be QApplication object
PaymentServer(QObject* parent, bool startLocalServer = true);