neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix deadlock in governance on cs_main (#1303)

Browse Source
This commit is contained in:
Tim Flynn 2017-02-01 18:07:24 -05:00 committed by UdjinM6
parent 3bfa5392fa
commit 944420deb0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/governance.cpp
View File

@ -879,7 +879,7 @@ bool CGovernanceManager::ProcessVote(CNode* pfrom, const CGovernanceVote& vote,
void CGovernanceManager::CheckMasternodeOrphanVotes() void CGovernanceManager::CheckMasternodeOrphanVotes()
{ {
LOCK(cs); LOCK2(cs_main, cs);
fRateChecksEnabled = false; fRateChecksEnabled = false;
for(object_m_it it = mapObjects.begin(); it != mapObjects.end(); ++it) { for(object_m_it it = mapObjects.begin(); it != mapObjects.end(); ++it) {
it->second.CheckOrphanVotes(); it->second.CheckOrphanVotes();
@ -889,7 +889,7 @@ void CGovernanceManager::CheckMasternodeOrphanVotes()
void CGovernanceManager::CheckMasternodeOrphanObjects() void CGovernanceManager::CheckMasternodeOrphanObjects()
{ {
LOCK(cs); LOCK2(cs_main, cs);
int64_t nNow = GetAdjustedTime(); int64_t nNow = GetAdjustedTime();
fRateChecksEnabled = false; fRateChecksEnabled = false;
object_time_m_it it = mapMasternodeOrphanObjects.begin(); object_time_m_it it = mapMasternodeOrphanObjects.begin();