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

Convert windows file paths to unix notation. 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/15888
This commit is contained in:
Jeff Young 2023-10-21 13:30:51 +01:00
parent 76e1babb88
commit eff4e2cc9c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eeschema/sim/sim_lib_mgr.cpp
View File

@ -55,7 +55,11 @@ void SIM_LIB_MGR::Clear()
wxString SIM_LIB_MGR::ResolveLibraryPath( const wxString& aLibraryPath, const PROJECT* aProject )
{
wxString expandedPath = ExpandEnvVarSubstitutions( aLibraryPath, aProject );
wxString expandedPath = ExpandEnvVarSubstitutions( aLibraryPath, aProject );
// Convert it to UNIX format
expandedPath.Replace( '\\', '/' );
wxFileName fn( expandedPath );
if( fn.IsAbsolute() )
@ -74,10 +78,10 @@ wxString SIM_LIB_MGR::ResolveLibraryPath( const wxString& aLibraryPath, const PR
if( !spiceLibDir.IsEmpty() && spiceLibFn.MakeAbsolute( spiceLibDir ) && spiceLibFn.Exists() )
return spiceLibFn.GetFullPath();
if( projectFn.GetFullPath() == spiceLibFn.GetFullPath() )
if( spiceLibDir.IsEmpty() || spiceLibFn.GetFullPath() == projectFn.GetFullPath() )
{
THROW_IO_ERROR( wxString::Format( _( "Simulation model library not found at '%s'" ),
spiceLibFn.GetFullPath() ) );
projectFn.GetFullPath() ) );
}
else
{