aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2013-06-05 09:27:23 -0700
committerWladimir J. van der Laan <[email protected]>2013-06-05 09:27:23 -0700
commitfc1f360fceaf774393a8eb5c075df469c75519f8 (patch)
tree648b7cd51d87dfb558a19ffd08cbe9942fe93ed5
parentMerge pull request #2741 from theuni/fix-osx-dock (diff)
parentBitcoin-Qt: harmonize 2 setClientModel() functions (diff)
downloaddiscoin-fc1f360fceaf774393a8eb5c075df469c75519f8.tar.xz
discoin-fc1f360fceaf774393a8eb5c075df469c75519f8.zip
Merge pull request #2731 from Diapolo/rpcconsole
Bitcoin-Qt: harmonize 2 setClientModel() functions
-rw-r--r--src/qt/rpcconsole.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 7f90f4a55..ef72b1720 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());
}
}