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

Don't dereference NULL when checking current part.

This commit is contained in:
Jeff Young 2018-11-20 20:14:00 +00:00
parent a958b23a11
commit d6ac303a8c
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
eeschema/libedit/libedit.cpp
View File

@ -575,20 +575,24 @@ void LIB_EDIT_FRAME::OnRevert( wxCommandEvent& aEvent )
if( !ConfirmRevertDialog( this, msg ) ) if( !ConfirmRevertDialog( this, msg ) )
return; return;
bool reload_currentPart; bool reload_currentPart = false;
wxString curr_partName = partName; wxString curr_partName = partName;
// the library itself is reverted: the current part will be reloaded only if it is owned by this library if( GetCurPart() )
if( partName.IsEmpty() )
{ {
LIB_ID curr_libId = GetCurPart()->GetLibId(); // the library itself is reverted: the current part will be reloaded only if it is
reload_currentPart = libName == curr_libId.GetLibNickname(); // owned by this library
if( partName.IsEmpty() )
{
LIB_ID curr_libId = GetCurPart()->GetLibId();
reload_currentPart = libName == curr_libId.GetLibNickname();
if( reload_currentPart ) if( reload_currentPart )
curr_partName = curr_libId.GetLibItemName(); curr_partName = curr_libId.GetLibItemName();
}
else
reload_currentPart = isCurrentPart( libId );
} }
else
reload_currentPart = isCurrentPart( libId );
int unit = m_unit; int unit = m_unit;