haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix deadlock when filling single zone.

This commit is contained in:
Jeff Young 2020-10-24 14:18:15 +01:00
parent f34ee00a8b
commit d2eca81b8b
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pcbnew/zone_filler.cpp
View File

@ -222,7 +222,7 @@ bool ZONE_FILLER::Fill( std::vector<ZONE_CONTAINER*>& aZones, bool aCheck, wxWin
// Check for any fill dependencies. If our zone needs to be clipped by // Check for any fill dependencies. If our zone needs to be clipped by
// another zone then we can't fill until that zone is filled. // another zone then we can't fill until that zone is filled.
for( ZONE_CONTAINER* otherZone : m_board->Zones() ) for( ZONE_CONTAINER* otherZone : aZones )
{ {
if( otherZone == zone ) if( otherZone == zone )
continue; continue;
@ -234,18 +234,6 @@ bool ZONE_FILLER::Fill( std::vector<ZONE_CONTAINER*>& aZones, bool aCheck, wxWin
} }
} }
for( MODULE* module : m_board->Modules() )
{
for( ZONE_CONTAINER* otherZone : module->Zones() )
{
if( check_fill_dependency( zone, layer, otherZone ) )
{
canFill = false;
break;
}
}
}
if( m_progressReporter && m_progressReporter->IsCancelled() ) if( m_progressReporter && m_progressReporter->IsCancelled() )
break; break;