merge downstream 0.11.x

This commit is contained in:
vertoe 2015-01-12 16:04:47 +01:00
commit 4269e16f0d
3 changed files with 12 additions and 2 deletions

View File

@ -2168,8 +2168,15 @@ void ThreadCheckDarkSendPool()
if(c % 60 == 0){
vector<CMasterNode>::iterator it = vecMasternodes.begin();
//check them separately
while(it != vecMasternodes.end()){
(*it).Check();
++it;
}
//remove inactive
it = vecMasternodes.begin();
while(it != vecMasternodes.end()){
if((*it).enabled == 4 || (*it).enabled == 3){
LogPrintf("Removing inactive masternode %s\n", (*it).addr.ToString().c_str());
it = vecMasternodes.erase(it);
@ -2182,7 +2189,6 @@ void ThreadCheckDarkSendPool()
CleanTransactionLocksList();
}
//try to sync the masternode list and payment list every 20 seconds
if(c % 5 == 0 && RequestedMasterNodeList <= 2){
bool fIsInitialDownload = IsInitialBlockDownload();

View File

@ -1052,6 +1052,10 @@ bool AcceptableInputs(CTxMemPool& pool, CValidationState &state, const CTransact
CCoinsViewMemPool viewMemPool(*pcoinsTip, pool);
view.SetBackend(viewMemPool);
// do we already have it?
if (view.HaveCoins(hash))
return false;
// do all inputs exist?
// Note that this does not check for the presence of actual outputs (see the next check for that),
// only helps filling in pfMissingInputs (to determine missing vs spent).

View File

@ -465,7 +465,7 @@ void SendCoinsDialog::setBalance(qint64 balance, qint64 unconfirmedBalance, qint
void SendCoinsDialog::updateDisplayUnit()
{
setBalance(model->getBalance(), 0, 0, 0);
setBalance(model->getBalance(), model->getUnconfirmedBalance(), model->getImmatureBalance(), model->getAnonymizedBalance());
}
void SendCoinsDialog::processSendCoinsReturn(const WalletModel::SendCoinsReturn &sendCoinsReturn, const QString &msgArg)