diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-01-12 10:01:24 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-01-12 10:01:31 +0100 |
| commit | 0a4fefe18faed00db3a89122c0e0900f9c7ad816 (patch) | |
| tree | 29790d7a2f9fcd0a96a87c518c6f54dc6d3cb1b2 /src | |
| parent | Merge pull request #3507 (diff) | |
| parent | [Qt] guard bitcoin-config.h and remove dublicated help message code (diff) | |
| download | discoin-0a4fefe18faed00db3a89122c0e0900f9c7ad816.tar.xz discoin-0a4fefe18faed00db3a89122c0e0900f9c7ad816.zip | |
Merge pull request #3511
245a6ab [Qt] guard bitcoin-config.h and remove dublicated help message code (Philip Kaufmann)
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/bitcoin.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 82d8af77d..b8342b5a9 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -2,7 +2,10 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#if defined(HAVE_CONFIG_H) #include "bitcoin-config.h" +#endif + #include "bitcoingui.h" #include "clientmodel.h" @@ -553,15 +556,6 @@ int main(int argc, char *argv[]) // Subscribe to global signals from core uiInterface.InitMessage.connect(InitMessage); - // Show help message immediately after parsing command-line options (for "-lang") and setting locale, - // but before showing splash screen. - if (mapArgs.count("-?") || mapArgs.count("--help")) - { - GUIUtil::HelpMessageBox help; - help.showOrPrint(); - return 1; - } - if (GetBoolArg("-splash", true) && !GetBoolArg("-min", false)) app.createSplashScreen(isaTestNet); |