diff options
| author | Gavin Andresen <[email protected]> | 2011-12-19 12:23:00 -0800 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2011-12-19 12:23:00 -0800 |
| commit | 3528650560a2c417da2303869c743da019defc6d (patch) | |
| tree | 2fad076c1d8edd824a4e8b8b9fb6261627ea6683 /src | |
| parent | Merge branch 'txn_block_info' of https://github.com/luke-jr/bitcoin (diff) | |
| parent | When using Qt GUI, move parameter-parsing to start of qt/bitcoin.cpp:main() (diff) | |
| download | discoin-3528650560a2c417da2303869c743da019defc6d.tar.xz discoin-3528650560a2c417da2303869c743da019defc6d.zip | |
Merge pull request #690 from runeksvendsen/qt-cmdline-options-parsing
When using Qt GUI, move parameter-parsing to start of qt/bitcoin.cpp:main()
Diffstat (limited to 'src')
| -rw-r--r-- | src/init.cpp | 3 | ||||
| -rw-r--r-- | src/qt/bitcoin.cpp | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/init.cpp b/src/init.cpp index 76317557b..b9e35aeac 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 dd326a690..cba4e851b 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -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 |