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

Fix blank DC sources causing crash in dialog creation 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/9482
This commit is contained in:
Jon Evans 2021-10-30 11:17:10 -04:00
parent 5f8e0ef1e0
commit 80e372b7d9
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
eeschema/dialogs/dialog_sim_settings.cpp
View File

@ -395,30 +395,24 @@ void DIALOG_SIM_SETTINGS::updateDCSources( wxChar aType, wxChoice* aSource )
if( !aSource->IsEmpty() )
prevSelection = aSource->GetString( aSource->GetSelection() );
std::vector<wxString> sourcesList;
bool enableSrcSelection = true;
std::set<wxString> sourcesList;
bool enableSrcSelection = true;
if( aType != 'T' )
{
for( const auto& item : m_exporter->GetSpiceItems() )
{
if( item.m_primitive == aType )
sourcesList.push_back( item.m_refName );
if( item.m_primitive == aType && !item.m_refName.IsEmpty() )
sourcesList.insert( item.m_refName );
}
std::sort( sourcesList.begin(), sourcesList.end(),
[](wxString& a, wxString& b) -> bool
{
return a.Len() < b.Len() || b.Cmp( a ) > 0;
} );
if( aSource == m_dcSource2 && !m_dcEnable2->IsChecked() )
enableSrcSelection = false;
}
else
{
prevSelection = wxT( "TEMP" );
sourcesList.push_back( prevSelection );
sourcesList.insert( prevSelection );
enableSrcSelection = false;
}
@ -426,7 +420,7 @@ void DIALOG_SIM_SETTINGS::updateDCSources( wxChar aType, wxChoice* aSource )
aSource->Clear();
for( auto& src : sourcesList )
for( const wxString& src : sourcesList )
aSource->Append( src );
// Try to restore the previous selection, if possible