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

When checking for duplicate aliases look in the dialog not the symbol. 

Fixes: lp:1821543
* https://bugs.launchpad.net/kicad/+bug/1821543

(cherry picked from commit e90452d0e2)
This commit is contained in:
Jeff Young 2019-04-10 18:11:30 +01:00
parent 9fc7281fab
commit cb5948d3a5
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eeschema/dialogs/dialog_edit_component_in_lib.cpp
View File

@ -657,6 +657,14 @@ bool DIALOG_EDIT_COMPONENT_IN_LIBRARY::checkAliasName( const wxString& aName )
if( aName.IsEmpty() ) if( aName.IsEmpty() )
return false; return false;
if( m_SymbolNameCtrl->GetValue().CmpNoCase( aName ) == 0 )
{
wxString msg;
msg.Printf( _( "Alias can not have same name as symbol." ) );
DisplayInfoMessage( this, msg );
return false;
}
for( int i = 0; i < (int)m_aliasListBox->GetCount(); ++i ) for( int i = 0; i < (int)m_aliasListBox->GetCount(); ++i )
{ {
if( i == m_aliasListBox->GetSelection() ) if( i == m_aliasListBox->GetSelection() )
@ -700,7 +708,7 @@ void DIALOG_EDIT_COMPONENT_IN_LIBRARY::OnAddAlias( wxCommandEvent& event )
wxString aliasname = _( "untitled" ); wxString aliasname = _( "untitled" );
int suffix = 1; int suffix = 1;
while( m_libEntry->HasAlias( aliasname ) ) while( m_aliasListBox->FindString( aliasname ) != wxNOT_FOUND )
aliasname = wxString::Format( _( "untitled%i" ), suffix++ ); aliasname = wxString::Format( _( "untitled%i" ), suffix++ );
LIB_ALIAS* alias = new LIB_ALIAS( aliasname, m_libEntry ); LIB_ALIAS* alias = new LIB_ALIAS( aliasname, m_libEntry );