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

Fixes crash in wire property dialog 

Fixes crash when changes are applied with the style combo in the
indeterminate state.
This commit is contained in:
Erik Agsjö 2023-06-20 23:59:01 +02:00 committed by Jeff Young
parent f892194be4
commit 2651d7ff5b
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
eeschema/dialogs/dialog_wire_bus_properties.cpp
View File

@ -193,18 +193,21 @@ bool DIALOG_WIRE_BUS_PROPERTIES::TransferDataFromWindow()
static_cast<SCH_BUS_ENTRY_BASE*>( item )->SetPenWidth( width ); static_cast<SCH_BUS_ENTRY_BASE*>( item )->SetPenWidth( width );
} }
PLOT_DASH_TYPE lineStyle = PLOT_DASH_TYPE::DEFAULT; size_t lineTypeSelection = m_typeCombo->GetSelection();
if( lineTypeSelection < lineTypeNames.size() )
{
PLOT_DASH_TYPE lineStyle = PLOT_DASH_TYPE::DEFAULT;
auto it = lineTypeNames.begin(); auto it = lineTypeNames.begin();
std::advance( it, m_typeCombo->GetSelection() ); std::advance( it, lineTypeSelection );
if( it != lineTypeNames.end() )
lineStyle = it->first;
if( it != lineTypeNames.end() ) if( item->Type() == SCH_LINE_T )
lineStyle = it->first; static_cast<SCH_LINE*>( item )->SetLineStyle( lineStyle );
else if( dynamic_cast<SCH_BUS_ENTRY_BASE*>( item ) )
if( item->Type() == SCH_LINE_T ) static_cast<SCH_BUS_ENTRY_BASE*>( item )->SetLineStyle( lineStyle );
static_cast<SCH_LINE*>( item )->SetLineStyle( lineStyle ); }
else if( dynamic_cast<SCH_BUS_ENTRY_BASE*>( item ) )
static_cast<SCH_BUS_ENTRY_BASE*>( item )->SetLineStyle( lineStyle );
COLOR4D color = m_colorSwatch->GetSwatchColor(); COLOR4D color = m_colorSwatch->GetSwatchColor();