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

Remove assert that fires in normal operation 

The missing symbol happens normally when the user does not have their
cache file available.  This should not be an assert
This commit is contained in:
Seth Hillbrand 2020-07-06 14:25:07 -07:00
parent 0410fdd9fb
commit 66f38dfc10
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
eeschema/symbol_lib_table.cpp
View File

@ -286,10 +286,7 @@ SYMBOL_LIB_TABLE_ROW* SYMBOL_LIB_TABLE::FindRow( const wxString& aNickname )
SYMBOL_LIB_TABLE_ROW* row = dynamic_cast< SYMBOL_LIB_TABLE_ROW* >( findRow( aNickname ) ); SYMBOL_LIB_TABLE_ROW* row = dynamic_cast< SYMBOL_LIB_TABLE_ROW* >( findRow( aNickname ) );
if( !row ) if( !row )
{
wxFAIL_MSG( "sym-lib-table files contain no library with nickname " + aNickname );
return nullptr; return nullptr;
}
// We've been 'lazy' up until now, but it cannot be deferred any longer, // We've been 'lazy' up until now, but it cannot be deferred any longer,
// instantiate a PLUGIN of the proper kind if it is not already in this // instantiate a PLUGIN of the proper kind if it is not already in this
@ -334,7 +331,9 @@ void SYMBOL_LIB_TABLE::LoadSymbolLib( std::vector<LIB_PART*>& aSymbolList,
LIB_PART* SYMBOL_LIB_TABLE::LoadSymbol( const wxString& aNickname, const wxString& aSymbolName ) LIB_PART* SYMBOL_LIB_TABLE::LoadSymbol( const wxString& aNickname, const wxString& aSymbolName )
{ {
SYMBOL_LIB_TABLE_ROW* row = FindRow( aNickname ); SYMBOL_LIB_TABLE_ROW* row = FindRow( aNickname );
wxCHECK( row && row->plugin, nullptr );
if( !row || !row->plugin )
return nullptr;
LIB_PART* part = row->plugin->LoadSymbol( row->GetFullURI( true ), aSymbolName, LIB_PART* part = row->plugin->LoadSymbol( row->GetFullURI( true ), aSymbolName,
row->GetProperties() ); row->GetProperties() );