Commit b5bb5642 authored by Wayne Stambaugh's avatar Wayne Stambaugh

Fix footprint library search path bug. (fixes lp:1178427

parent 25545756
...@@ -32,20 +32,14 @@ ...@@ -32,20 +32,14 @@
* and their documentation (comments and keywords) * and their documentation (comments and keywords)
*/ */
#include <fctsys.h> #include <fctsys.h>
#include <wxstruct.h>
#include <common.h> #include <common.h>
#include <kicad_string.h>
#include <macros.h> #include <macros.h>
#include <appl_wxstruct.h> #include <appl_wxstruct.h>
#include <wildcards_and_files_ext.h>
#include <pcbcommon.h>
#include <pcbstruct.h>
#include <footprint_info.h> #include <footprint_info.h>
#include <io_mgr.h> #include <io_mgr.h>
#include <class_pad.h>
#include <class_module.h> #include <class_module.h>
#include <wildcards_and_files_ext.h>
bool FOOTPRINT_LIST::ReadFootprintFiles( wxArrayString& aFootprintsLibNames ) bool FOOTPRINT_LIST::ReadFootprintFiles( wxArrayString& aFootprintsLibNames )
...@@ -62,14 +56,20 @@ bool FOOTPRINT_LIST::ReadFootprintFiles( wxArrayString& aFootprintsLibNames ) ...@@ -62,14 +56,20 @@ bool FOOTPRINT_LIST::ReadFootprintFiles( wxArrayString& aFootprintsLibNames )
// Parse Libraries Listed // Parse Libraries Listed
for( unsigned ii = 0; ii < aFootprintsLibNames.GetCount(); ii++ ) for( unsigned ii = 0; ii < aFootprintsLibNames.GetCount(); ii++ )
{ {
// File names can be fully qualified or file name only. // Footprint library file names can be fully qualified or file name only.
wxFileName filename = aFootprintsLibNames[ii]; wxFileName filename = aFootprintsLibNames[ii];
if( !filename.IsAbsolute() ) if( !filename.FileExists() )
{ {
filename = wxFileName( wxEmptyString, aFootprintsLibNames[ii], filename = wxGetApp().FindLibraryPath( filename.GetFullName() );
LegacyFootprintLibPathExtension );
filename = wxGetApp().FindLibraryPath( filename ); if( !filename.FileExists() )
{
filename = wxFileName( wxEmptyString, aFootprintsLibNames[ii],
LegacyFootprintLibPathExtension );
filename = wxGetApp().FindLibraryPath( filename.GetFullName() );
}
} }
if( !filename.FileExists() ) if( !filename.FileExists() )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment