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

Eeschema: Opening "Edit Symbol Fields" dialog crashes Eeschema 

Fixes: lp:1795088
https://bugs.launchpad.net/kicad/+bug/1795088
This commit is contained in:
jean-pierre charras 2018-09-29 10:08:29 +02:00
parent 3f6819e592
commit 094f340359
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
eeschema/dialogs/dialog_fields_editor_global.cpp
View File

@ -600,18 +600,19 @@ public:
if( aCol == REFERENCE ) if( aCol == REFERENCE )
{ {
for( unsigned row = 0; row < GetNumberRows(); ++row ) for( int row = 0; row < GetNumberRows(); ++row )
{ {
width = std::max( width, GetTextSize( GetValue( row, aCol ), GetView() ).x ); width = std::max( width, GetTextSize( GetValue( row, aCol ), GetView() ).x );
} }
} }
else else
{ {
wxString column_label = GetColLabelValue( aCol ); // component fieldName or Qty string
for( unsigned compRef = 0; compRef < m_componentRefs.GetCount(); ++ compRef ) for( unsigned compRef = 0; compRef < m_componentRefs.GetCount(); ++ compRef )
{ {
timestamp_t compId = m_componentRefs[ compRef ].GetComp()->GetTimeStamp(); timestamp_t compId = m_componentRefs[ compRef ].GetComp()->GetTimeStamp();
wxString text = m_dataStore[ compId ][ m_fieldNames[ aCol ] ]; wxString text = m_dataStore[ compId ][ column_label ];
width = std::max( width, GetTextSize( text, GetView() ).x ); width = std::max( width, GetTextSize( text, GetView() ).x );
} }
} }