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

router: Limit the amount of move attempts in ROUTER::Finish 

Otherwise auto-finish hangs in some cases.
This commit is contained in:
Alex 2022-12-07 19:24:00 +03:00
parent b15913bd53
commit 82874daf08
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pcbnew/router/pns_router.cpp
View File

@ -540,13 +540,16 @@ bool ROUTER::Finish()
if( !getNearestRatnestAnchor( otherEnd, otherEndLayers ) )
return false;
// Keep moving until we don't change position
// Keep moving until we don't change position or hit the limit
int triesLeft = 5;
VECTOR2I moveResultPoint;
do
{
moveResultPoint = Placer()->CurrentEnd();
Move( otherEnd, &current );
} while( Placer()->CurrentEnd() != moveResultPoint );
triesLeft--;
} while( Placer()->CurrentEnd() != moveResultPoint && triesLeft );
// If we've made it, fix the route and we're done
if( moveResultPoint == otherEnd && otherEndLayers.Overlaps( GetCurrentLayer() ) )
@ -794,7 +797,7 @@ std::unique_ptr<NODE> ROUTER::GetUpdatedItems( std::vector<PNS::ITEM*>& aRemoved
}
tmpNode->GetUpdatedItems( aRemoved, aAdded );
return std::move( tmpNode );
}