diff options
| -rw-r--r-- | src/qt/macdockiconhandler.mm | 8 | ||||
| -rw-r--r-- | src/qt/rpcconsole.cpp | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/qt/macdockiconhandler.mm b/src/qt/macdockiconhandler.mm index 53b49c42e6..8f826941b2 100644 --- a/src/qt/macdockiconhandler.mm +++ b/src/qt/macdockiconhandler.mm @@ -51,6 +51,7 @@ MacDockIconHandler::MacDockIconHandler() : QObject() this->m_dockIconClickEventHandler = [[DockIconClickEventHandler alloc] initWithDockIconHandler:this]; this->m_dummyWidget = new QWidget(); this->m_dockMenu = new QMenu(this->m_dummyWidget); + this->setMainWindow(NULL); [pool release]; } @@ -114,8 +115,11 @@ MacDockIconHandler *MacDockIconHandler::instance() void MacDockIconHandler::handleDockIconClickEvent() { - this->mainWindow->activateWindow(); - this->mainWindow->show(); + if (this->mainWindow) + { + this->mainWindow->activateWindow(); + this->mainWindow->show(); + } emit this->dockIconClicked(); } diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index 7f90f4a551..ef72b17201 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -254,8 +254,11 @@ void RPCConsole::setClientModel(ClientModel *model) this->clientModel = model; if(model) { - // Subscribe to information, replies, messages, errors + // Keep up to date with client + setNumConnections(model->getNumConnections()); connect(model, SIGNAL(numConnectionsChanged(int)), this, SLOT(setNumConnections(int))); + + setNumBlocks(model->getNumBlocks(), model->getNumBlocksOfPeers()); connect(model, SIGNAL(numBlocksChanged(int,int)), this, SLOT(setNumBlocks(int,int))); // Provide initial values @@ -264,7 +267,6 @@ void RPCConsole::setClientModel(ClientModel *model) ui->buildDate->setText(model->formatBuildDate()); ui->startupTime->setText(model->formatClientStartupTime()); - setNumConnections(model->getNumConnections()); ui->isTestNet->setChecked(model->isTestNet()); } } |