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

Fix cherry pick error on previous commit.

This commit is contained in:
Wayne Stambaugh 2020-04-02 16:09:25 -04:00
parent d79e598bf8
commit a2d7881afe
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
eeschema/sch_base_frame.cpp
View File

@ -47,11 +47,11 @@ LIB_ALIAS* SchGetLibAlias( const LIB_ID& aLibId, SYMBOL_LIB_TABLE* aLibTable, PA
{
wxCHECK_MSG( aLibTable, nullptr, "Invalid symbol library table." );
LIB_PART* symbol = nullptr;
LIB_ALIAS* symbol = nullptr;
try
{
alias = aLibTable->LoadSymbol( aLibId );
symbol = aLibTable->LoadSymbol( aLibId );
if( !symbol && aCacheLib )
{
@ -59,7 +59,7 @@ LIB_ALIAS* SchGetLibAlias( const LIB_ID& aLibId, SYMBOL_LIB_TABLE* aLibTable, PA
wxString cacheName = aLibId.GetLibNickname().wx_str();
cacheName += "_" + aLibId.GetLibItemName();
symbol = aCacheLib->FindPart( cacheName );
symbol = aCacheLib->FindAlias( cacheName );
}
}
catch( const IO_ERROR& ioe )
@ -74,7 +74,7 @@ LIB_ALIAS* SchGetLibAlias( const LIB_ID& aLibId, SYMBOL_LIB_TABLE* aLibTable, PA
}
}
return alias;
return symbol;
}