Commit e39e3d53 authored by stambaughw's avatar stambaughw
Browse files

Fix component library ordering bug.

parent 76d04d6a

eeschema/eelibs_read_libraryfiles.cpp

+9 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ void WinEDA_SchematicFrame::LoadLibraries( void ) 
    wxFileName     fn;

    wxString       msg, tmp, errMsg;

    wxString       libraries_not_found;

    wxArrayString  sortOrder;



    CMP_LIBRARY_LIST::iterator i = CMP_LIBRARY::GetLibraryList().begin();
@@ -73,6 +74,7 @@ void WinEDA_SchematicFrame::LoadLibraries( void ) 
        if( CMP_LIBRARY::AddLibrary( fn, errMsg ) )

        {

            msg += _( " loaded" );

            sortOrder.Add( fn.GetName() );

        }

        else

        {
@@ -100,10 +102,15 @@ Error: %s" ), 
    }



    /* Put the libraries in the correct order. */

    CMP_LIBRARY::SetSortOrder( m_ComponentLibFiles );

    CMP_LIBRARY::SetSortOrder( sortOrder );

    CMP_LIBRARY::GetLibraryList().sort();



#ifdef __WXDEBUG__

    wxLogDebug( wxT( "Requested component library sort order." ) );



    for( size_t i = 0; i < sortOrder.GetCount(); i++ )

        wxLogDebug( wxT( "    " ) + sortOrder[i] );



    wxLogDebug( wxT( "Component library sort order:" ) );



    for ( i = CMP_LIBRARY::GetLibraryList().begin();