diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-12-19 12:23:00 -0800 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-12-19 12:23:00 -0800 |
| commit | 3528650560a2c417da2303869c743da019defc6d (patch) | |
| tree | 2fad076c1d8edd824a4e8b8b9fb6261627ea6683 /src/init.cpp | |
| parent | bafb43d6c18c1bf7eb1fcc04bed85e45bd03e961 (diff) | |
| parent | 4dba26620cf1015b8e980ce3e401d15c64e1169d (diff) | |
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/init.cpp')
| -rw-r--r-- | src/init.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/init.cpp b/src/init.cpp index 76317557bc..b9e35aeac1 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")) { |