mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-20 02:25:40 +01:00
Code Issues Projects Releases Wiki Activity

qt: Stop shutdown detection timer during shutdown

Browse Source 
Stop the shutdown timer from exiting the main loop
when shutdown is already in progress.

Fixes seeming hanging window after typing 'stop' in debug console.

Also hide the debug console during shutdown as it is useless without
a core to connect to.
This commit is contained in:
Wladimir J. van der Laan 2014-01-08 10:45:00 +01:00
parent 35ecf854c0
commit 9a2305a1b3
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qt/bitcoin.cpp
View File

@ -193,6 +193,7 @@ private:
ClientModel *clientModel;
BitcoinGUI *window;
WalletModel *walletModel;
QTimer *pollShutdownTimer;
int returnValue;
void startThread();
@ -250,6 +251,7 @@ BitcoinApplication::BitcoinApplication(int &argc, char **argv):
clientModel(0),
window(0),
walletModel(0),
pollShutdownTimer(0),
returnValue(0)
{
setQuitOnLastWindowClosed(false);
@ -282,7 +284,7 @@ void BitcoinApplication::createWindow(bool isaTestNet)
{
window = new BitcoinGUI(isaTestNet, 0);
QTimer* pollShutdownTimer = new QTimer(window);
pollShutdownTimer = new QTimer(window);
connect(pollShutdownTimer, SIGNAL(timeout()), window, SLOT(detectShutdown()));
pollShutdownTimer->start(200);
}
@ -326,6 +328,7 @@ void BitcoinApplication::requestShutdown()
window->hide();
window->setClientModel(0);
window->removeAllWallets();
pollShutdownTimer->stop();
delete walletModel;
walletModel = 0;

6
src/qt/bitcoingui.cpp
View File

@ -855,7 +855,11 @@ void BitcoinGUI::toggleHidden()
void BitcoinGUI::detectShutdown()
{
if (ShutdownRequested())
QMetaObject::invokeMethod(QCoreApplication::instance(), "quit", Qt::QueuedConnection);
{
if(rpcConsole)
rpcConsole->hide();
qApp->quit();
}
}
static bool ThreadSafeMessageBox(BitcoinGUI *gui, const std::string& message, const std::string& caption, unsigned int style)