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

Cvpcb: fix "not found" .equ files. 

Fixes #11264
https://gitlab.com/kicad/code/kicad/issues/11264
This commit is contained in:
jean-pierre charras 2022-03-29 18:51:03 +02:00
parent a54bbfe12b
commit 66ebd68060
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cvpcb/auto_associate.cpp
View File

@ -1,7 +1,7 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2022 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -94,7 +94,10 @@ int CVPCB_MAINFRAME::buildEquivalenceList( FOOTPRINT_EQUIVALENCE_LIST& aList,
{ {
fn = wxExpandEnvVars( equfile ); fn = wxExpandEnvVars( equfile );
tmp = search.FindValidPath( fn.GetFullPath() ); if( fn.IsAbsolute() || fn.FileExists() )
tmp = fn.GetFullPath();
else
tmp = search.FindValidPath( fn.GetFullPath() );
if( !tmp ) if( !tmp )
{ {
@ -102,8 +105,7 @@ int CVPCB_MAINFRAME::buildEquivalenceList( FOOTPRINT_EQUIVALENCE_LIST& aList,
if( aErrorMessages ) if( aErrorMessages )
{ {
error_msg.Printf( _( "Equivalence file '%s' could not be found in the " error_msg.Printf( _( "Equivalence file '%s' could not be found." ),
"default search paths." ),
fn.GetFullName() ); fn.GetFullName() );
if( ! aErrorMessages->IsEmpty() ) if( ! aErrorMessages->IsEmpty() )