diff --git a/common/kiway_player.cpp b/common/kiway_player.cpp index 14deee0efa..a268e6bfd2 100644 --- a/common/kiway_player.cpp +++ b/common/kiway_player.cpp @@ -119,7 +119,6 @@ bool KIWAY_PLAYER::ShowModal( wxString* aResult, wxWindow* aResultantFocusWindow if( wlist[ii]->IsTopLevel() && wlist[ii]->IsEnabled() ) enabledTopLevelWindows.push_back( wlist[ii] ); - // exception safe way to disable all top level windows except the modal one, // re-enables only those that were disabled on exit wxWindowDisabler toggle( this ); diff --git a/pcbnew/dialogs/dialog_copper_zones.cpp b/pcbnew/dialogs/dialog_copper_zones.cpp index 53ebd2fc5d..46c77286fb 100644 --- a/pcbnew/dialogs/dialog_copper_zones.cpp +++ b/pcbnew/dialogs/dialog_copper_zones.cpp @@ -452,7 +452,9 @@ bool DIALOG_COPPER_ZONE::AcceptOptions( bool aPromptForErrors, bool aUseExportab (double) m_settings.m_ThermalReliefCopperBridge / IU_PER_MILS ); } - if( m_settings.m_ThermalReliefCopperBridge <= m_settings.m_ZoneMinThickness ) + if( ( m_settings.GetPadConnection() == PAD_ZONE_CONN_THT_THERMAL + || m_settings.GetPadConnection() == PAD_ZONE_CONN_THERMAL ) + && m_settings.m_ThermalReliefCopperBridge <= m_settings.m_ZoneMinThickness ) { DisplayError( this, _( "Thermal relief spoke must be greater than the minimum width." ) );