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

Fix SCH_SCREENS::HasNoFullyDefinedLibIds(): incorrectly returned true if no symbol found. 

Fixes #9195
https://gitlab.com/kicad/code/kicad/issues/9195
This commit is contained in:
jean-pierre charras 2021-09-20 18:28:33 +02:00
parent f66654247a
commit fada53d90c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eeschema/sch_screen.cpp
View File

@ -1164,6 +1164,8 @@ void SCH_SCREENS::buildScreenList( SCH_SHEET* aSheet )
{ {
SCH_SCREEN* screen = aSheet->GetScreen(); SCH_SCREEN* screen = aSheet->GetScreen();
wxCHECK_RET( screen, "No screen for aSheet" );
addScreenToList( screen, aSheet ); addScreenToList( screen, aSheet );
for( SCH_ITEM* item : screen->Items().OfType( SCH_SHEET_T ) ) for( SCH_ITEM* item : screen->Items().OfType( SCH_SHEET_T ) )
@ -1336,20 +1338,22 @@ void SCH_SCREENS::UpdateSymbolLinks( REPORTER* aReporter )
bool SCH_SCREENS::HasNoFullyDefinedLibIds() bool SCH_SCREENS::HasNoFullyDefinedLibIds()
{ {
SCH_SCREEN* screen; bool has_symbols = false;
for( screen = GetFirst(); screen; screen = GetNext() ) for( SCH_SCREEN* screen = GetFirst(); screen; screen = GetNext() )
{ {
for( SCH_ITEM* item : screen->Items().OfType( SCH_SYMBOL_T ) ) for( SCH_ITEM* item : screen->Items().OfType( SCH_SYMBOL_T ) )
{ {
SCH_SYMBOL* symbol = static_cast<SCH_SYMBOL*>( item ); SCH_SYMBOL* symbol = static_cast<SCH_SYMBOL*>( item );
has_symbols = true;
if( !symbol->GetLibId().GetLibNickname().empty() ) if( !symbol->GetLibId().GetLibNickname().empty() )
return false; return false;
} }
} }
return true; // return true (i.e. has no fully defined symbol) only if at least one symbol is found
return has_symbols ? true : false;
} }