From 245a6ab1ae2655dede237ce25d9c50320ead5124 Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Sat, 11 Jan 2014 18:56:24 +0100 Subject: [PATCH] [Qt] guard bitcoin-config.h and remove dublicated help message code --- src/qt/bitcoin.cpp | 12 +++--------- 1 file 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);