diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -176,8 +176,8 @@ void shutdown(); Q_SIGNALS: - void initializeResult(int retval); - void shutdownResult(int retval); + void initializeResult(bool success); + void shutdownResult(); void runawayException(const QString &message); private: @@ -222,8 +222,8 @@ WId getMainWinId() const; public Q_SLOTS: - void initializeResult(int retval); - void shutdownResult(int retval); + void initializeResult(bool success); + void shutdownResult(); /// Handle runaway exceptions. Shows a message box with the problem and /// quits the program. void handleRunawayException(const QString &message); @@ -284,8 +284,8 @@ return; } - int rv = AppInitMain(config, *httpRPCRequestProcessor, threadGroup, - scheduler); + bool rv = AppInitMain(config, *httpRPCRequestProcessor, threadGroup, + scheduler); Q_EMIT initializeResult(rv); } catch (const std::exception &e) { handleRunawayException(&e); @@ -301,7 +301,7 @@ threadGroup.join_all(); Shutdown(); qDebug() << __func__ << ": Shutdown finished"; - Q_EMIT shutdownResult(1); + Q_EMIT shutdownResult(); } catch (const std::exception &e) { handleRunawayException(&e); } catch (...) { @@ -388,10 +388,9 @@ executor->moveToThread(coreThread); /* communication to and from thread */ - connect(executor, SIGNAL(initializeResult(int)), this, - SLOT(initializeResult(int))); - connect(executor, SIGNAL(shutdownResult(int)), this, - SLOT(shutdownResult(int))); + connect(executor, SIGNAL(initializeResult(bool)), this, + SLOT(initializeResult(bool))); + connect(executor, SIGNAL(shutdownResult()), this, SLOT(shutdownResult())); connect(executor, SIGNAL(runawayException(QString)), this, SLOT(handleRunawayException(QString))); @@ -463,11 +462,10 @@ Q_EMIT requestedShutdown(); } -void BitcoinApplication::initializeResult(int retval) { - qDebug() << __func__ << ": Initialization result: " << retval; - // Set exit result: 0 if successful, 1 if failure - returnValue = retval ? 0 : 1; - if (retval) { +void BitcoinApplication::initializeResult(bool success) { + qDebug() << __func__ << ": Initialization result: " << success; + returnValue = success ? EXIT_SUCCESS : EXIT_FAILURE; + if (success) { // Log this only after AppInit2 finishes, as then logging setup is // guaranteed complete. qWarning() << "Platform customization:" << platformStyle->getName(); @@ -522,8 +520,7 @@ } } -void BitcoinApplication::shutdownResult(int retval) { - qDebug() << __func__ << ": Shutdown result: " << retval; +void BitcoinApplication::shutdownResult() { // Exit main loop after shutdown finished. quit(); }