[Qt] guard bitcoin-config.h and remove dublicated help message code
This commit is contained in:
parent
5a407bd095
commit
245a6ab1ae
@ -2,7 +2,10 @@
|
|||||||
// Distributed under the MIT/X11 software license, see the accompanying
|
// Distributed under the MIT/X11 software license, see the accompanying
|
||||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
|
#if defined(HAVE_CONFIG_H)
|
||||||
#include "bitcoin-config.h"
|
#include "bitcoin-config.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "bitcoingui.h"
|
#include "bitcoingui.h"
|
||||||
|
|
||||||
#include "clientmodel.h"
|
#include "clientmodel.h"
|
||||||
@ -553,15 +556,6 @@ int main(int argc, char *argv[])
|
|||||||
// Subscribe to global signals from core
|
// Subscribe to global signals from core
|
||||||
uiInterface.InitMessage.connect(InitMessage);
|
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))
|
if (GetBoolArg("-splash", true) && !GetBoolArg("-min", false))
|
||||||
app.createSplashScreen(isaTestNet);
|
app.createSplashScreen(isaTestNet);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user