diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-01-05 12:37:51 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-01-05 12:55:03 +0100 |
| commit | 2102ab9f5cb542e6727e0f25e670d8549aa1bf1a (patch) | |
| tree | cad487646827981bacb34d1d102c143eb6e858f8 /src/qt/intro.cpp | |
| parent | Merge pull request #3474 (diff) | |
| download | discoin-2102ab9f5cb542e6727e0f25e670d8549aa1bf1a.tar.xz discoin-2102ab9f5cb542e6727e0f25e670d8549aa1bf1a.zip | |
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/intro.cpp')
| -rw-r--r-- | src/qt/intro.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index 3ecd96cc4..5f7ccf709 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -148,7 +148,7 @@ QString Intro::getDefaultDataDirectory() void Intro::pickDataDirectory(bool fIsTestnet) { - namespace fs = boost::filesystem;; + namespace fs = boost::filesystem; QSettings settings; /* If data directory provided on command line, no need to look at settings or show a picking dialog */ |