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

Cleanup.

This commit is contained in:
Jeff Young 2020-12-28 18:18:23 +00:00
parent 93466fa165
commit cfb4e34b07
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pcbnew/zone_filler.cpp
View File

@ -31,9 +31,7 @@
#include <board.h> #include <board.h>
#include <zone.h> #include <zone.h>
#include <footprint.h> #include <footprint.h>
#include <fp_shape.h>
#include <pcb_shape.h> #include <pcb_shape.h>
#include <pcb_text.h>
#include <pcb_target.h> #include <pcb_target.h>
#include <track.h> #include <track.h>
#include <connectivity/connectivity_data.h> #include <connectivity/connectivity_data.h>
@ -92,13 +90,13 @@ bool ZONE_FILLER::Fill( std::vector<ZONE*>& aZones, bool aCheck, wxWindow* aPare
std::shared_ptr<CONNECTIVITY_DATA> connectivity = m_board->GetConnectivity(); std::shared_ptr<CONNECTIVITY_DATA> connectivity = m_board->GetConnectivity();
std::unique_lock<std::mutex> lock( connectivity->GetLock(), std::try_to_lock ); std::unique_lock<std::mutex> lock( connectivity->GetLock(), std::try_to_lock );
if( !lock )
return false;
BOARD_DESIGN_SETTINGS& bds = m_board->GetDesignSettings(); BOARD_DESIGN_SETTINGS& bds = m_board->GetDesignSettings();
m_worstClearance = bds.GetBiggestClearanceValue(); m_worstClearance = bds.GetBiggestClearanceValue();
if( !lock )
return false;
if( m_progressReporter ) if( m_progressReporter )
{ {
m_progressReporter->Report( aCheck ? _( "Checking zone fills..." ) m_progressReporter->Report( aCheck ? _( "Checking zone fills..." )
@ -494,7 +492,6 @@ bool ZONE_FILLER::Fill( std::vector<ZONE*>& aZones, bool aCheck, wxWindow* aPare
m_progressReporter->KeepRefreshing(); m_progressReporter->KeepRefreshing();
} }
connectivity->SetProgressReporter( nullptr );
return true; return true;
} }