diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-06-05 09:27:23 -0700 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-06-05 09:27:23 -0700 |
commit | fc1f360fceaf774393a8eb5c075df469c75519f8 (patch) | |
tree | 648b7cd51d87dfb558a19ffd08cbe9942fe93ed5 /src | |
parent | 83f9b58f15387821d8a63e3d42d33f26cba6e712 (diff) | |
parent | 1fc57d568b704f929890363a99d2a793956a15fe (diff) | |
download | bitcoin-fc1f360fceaf774393a8eb5c075df469c75519f8.tar.xz |
Merge pull request #2731 from Diapolo/rpcconsole
Bitcoin-Qt: harmonize 2 setClientModel() functions
Diffstat (limited to 'src')
-rw-r--r-- | src/qt/rpcconsole.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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()); } } |