Merge pull request #2731 from Diapolo/rpcconsole

Bitcoin-Qt: harmonize 2 setClientModel() functions
This commit is contained in:
Wladimir J. van der Laan 2013-06-05 09:27:23 -07:00
commit fc1f360fce

View file

@ -254,8 +254,11 @@ void RPCConsole::setClientModel(ClientModel *model)
this->clientModel = model; this->clientModel = model;
if(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))); 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))); connect(model, SIGNAL(numBlocksChanged(int,int)), this, SLOT(setNumBlocks(int,int)));
// Provide initial values // Provide initial values
@ -264,7 +267,6 @@ void RPCConsole::setClientModel(ClientModel *model)
ui->buildDate->setText(model->formatBuildDate()); ui->buildDate->setText(model->formatBuildDate());
ui->startupTime->setText(model->formatClientStartupTime()); ui->startupTime->setText(model->formatClientStartupTime());
setNumConnections(model->getNumConnections());
ui->isTestNet->setChecked(model->isTestNet()); ui->isTestNet->setChecked(model->isTestNet());
} }
} }