Merge remote-tracking branch 'upstream/v0.12.0.x' into v0.12.0.x

This commit is contained in:
crowning- 2015-07-05 03:11:45 +02:00
commit 860a895cf5

View File

@ -465,7 +465,7 @@ std::vector<CBudgetProposal*> CBudgetManager::GetAllProposals()
std::map<uint256, CBudgetProposal>::iterator it2 = mapProposals.begin();
while(it2 != mapProposals.end())
{
(*it).second.CleanAndRemove();
(*it2).second.CleanAndRemove();
CBudgetProposal* prop = &((*it2).second);
ret.push_back(prop);