Commit b35fbc0a authored by Wayne Stambaugh's avatar Wayne Stambaugh
Browse files

Set project footprint library table path environment variable before loading table.

parent 0d69a817

cvpcb/cfg.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -101,11 +101,11 @@ void CVPCB_MAINFRAME::LoadProjectFile( const wxString& aFileName ) 
    wxFileName projectFpLibTableFileName;

    wxFileName projectFpLibTableFileName;





    projectFpLibTableFileName = FP_LIB_TABLE::GetProjectFileName( fn );

    projectFpLibTableFileName = FP_LIB_TABLE::GetProjectFileName( fn );

    FP_LIB_TABLE::SetProjectPathEnvVariable( projectFpLibTableFileName );





    try

    try

    {

    {

        m_footprintLibTable->Load( projectFpLibTableFileName, m_globalFootprintTable );

        m_footprintLibTable->Load( projectFpLibTableFileName, m_globalFootprintTable );

        FP_LIB_TABLE::SetProjectPathEnvVariable( projectFpLibTableFileName );

    }

    }

    catch( IO_ERROR ioe )

    catch( IO_ERROR ioe )

    {

    {

pcbnew/pcbnew_config.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -249,6 +249,8 @@ bool PCB_EDIT_FRAME::LoadProjectSettings( const wxString& aProjectFileName ) 
    // Check if a project footprint table is defined and load it.  If no project footprint

    // Check if a project footprint table is defined and load it.  If no project footprint

    // table is defined, then the global library table is the footprint library table.

    // table is defined, then the global library table is the footprint library table.

#if defined( USE_FP_LIB_TABLE )

#if defined( USE_FP_LIB_TABLE )

    FP_LIB_TABLE::SetProjectPathEnvVariable( fn );



    delete m_footprintLibTable;

    delete m_footprintLibTable;





    wxFileName projectFpLibTableFileName;

    wxFileName projectFpLibTableFileName;
@@ -274,8 +276,6 @@ bool PCB_EDIT_FRAME::LoadProjectSettings( const wxString& aProjectFileName ) 




    if( viewFrame )

    if( viewFrame )

        viewFrame->SetFootprintLibTable( m_footprintLibTable );

        viewFrame->SetFootprintLibTable( m_footprintLibTable );



    FP_LIB_TABLE::SetProjectPathEnvVariable( fn );

#endif

#endif





    // Load the page layout decr file, from the filename stored in

    // Load the page layout decr file, from the filename stored in