|
|
|
@ -34,6 +34,7 @@
@@ -34,6 +34,7 @@
|
|
|
|
|
|
|
|
|
|
#include <boost/filesystem/operations.hpp> |
|
|
|
|
#include <QApplication> |
|
|
|
|
#include <QDebug> |
|
|
|
|
#include <QLibraryInfo> |
|
|
|
|
#include <QLocale> |
|
|
|
|
#include <QMessageBox> |
|
|
|
@ -237,7 +238,7 @@ void BitcoinCore::initialize()
@@ -237,7 +238,7 @@ void BitcoinCore::initialize()
|
|
|
|
|
{ |
|
|
|
|
try |
|
|
|
|
{ |
|
|
|
|
LogPrintf("Running AppInit2 in thread\n"); |
|
|
|
|
qDebug() << __func__ << ": Running AppInit2 in thread"; |
|
|
|
|
int rv = AppInit2(threadGroup); |
|
|
|
|
if(rv) |
|
|
|
|
{ |
|
|
|
@ -258,11 +259,11 @@ void BitcoinCore::shutdown()
@@ -258,11 +259,11 @@ void BitcoinCore::shutdown()
|
|
|
|
|
{ |
|
|
|
|
try |
|
|
|
|
{ |
|
|
|
|
LogPrintf("Running Shutdown in thread\n"); |
|
|
|
|
qDebug() << __func__ << ": Running Shutdown in thread"; |
|
|
|
|
threadGroup.interrupt_all(); |
|
|
|
|
threadGroup.join_all(); |
|
|
|
|
Shutdown(); |
|
|
|
|
LogPrintf("Shutdown finished\n"); |
|
|
|
|
qDebug() << __func__ << ": Shutdown finished"; |
|
|
|
|
emit shutdownResult(1); |
|
|
|
|
} catch (std::exception& e) { |
|
|
|
|
handleRunawayException(&e); |
|
|
|
@ -290,10 +291,10 @@ BitcoinApplication::BitcoinApplication(int &argc, char **argv):
@@ -290,10 +291,10 @@ BitcoinApplication::BitcoinApplication(int &argc, char **argv):
|
|
|
|
|
|
|
|
|
|
BitcoinApplication::~BitcoinApplication() |
|
|
|
|
{ |
|
|
|
|
LogPrintf("Stopping thread\n"); |
|
|
|
|
qDebug() << __func__ << ": Stopping thread"; |
|
|
|
|
emit stopThread(); |
|
|
|
|
coreThread->wait(); |
|
|
|
|
LogPrintf("Stopped thread\n"); |
|
|
|
|
qDebug() << __func__ << ": Stopped thread"; |
|
|
|
|
|
|
|
|
|
delete window; |
|
|
|
|
window = 0; |
|
|
|
@ -355,13 +356,13 @@ void BitcoinApplication::startThread()
@@ -355,13 +356,13 @@ void BitcoinApplication::startThread()
|
|
|
|
|
|
|
|
|
|
void BitcoinApplication::requestInitialize() |
|
|
|
|
{ |
|
|
|
|
LogPrintf("Requesting initialize\n"); |
|
|
|
|
qDebug() << __func__ << ": Requesting initialize"; |
|
|
|
|
emit requestedInitialize(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void BitcoinApplication::requestShutdown() |
|
|
|
|
{ |
|
|
|
|
LogPrintf("Requesting shutdown\n"); |
|
|
|
|
qDebug() << __func__ << ": Requesting shutdown"; |
|
|
|
|
window->hide(); |
|
|
|
|
window->setClientModel(0); |
|
|
|
|
pollShutdownTimer->stop(); |
|
|
|
@ -383,7 +384,7 @@ void BitcoinApplication::requestShutdown()
@@ -383,7 +384,7 @@ void BitcoinApplication::requestShutdown()
|
|
|
|
|
|
|
|
|
|
void BitcoinApplication::initializeResult(int retval) |
|
|
|
|
{ |
|
|
|
|
LogPrintf("Initialization result: %i\n", retval); |
|
|
|
|
qDebug() << __func__ << ": Initialization result: " << retval; |
|
|
|
|
// Set exit result: 0 if successful, 1 if failure
|
|
|
|
|
returnValue = retval ? 0 : 1; |
|
|
|
|
if(retval) |
|
|
|
@ -438,7 +439,7 @@ void BitcoinApplication::initializeResult(int retval)
@@ -438,7 +439,7 @@ void BitcoinApplication::initializeResult(int retval)
|
|
|
|
|
|
|
|
|
|
void BitcoinApplication::shutdownResult(int retval) |
|
|
|
|
{ |
|
|
|
|
LogPrintf("Shutdown result: %i\n", retval); |
|
|
|
|
qDebug() << __func__ << ": Shutdown result: " << retval; |
|
|
|
|
quit(); // Exit main loop after shutdown finished
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|