AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-21 00:21:25 +00:00
Files Issues Releases Activity

Fix URI environment variable expansion issue.

Browse Source 
Fixes https://gitlab.com/kicad/code/kicad/-/issues/18918
This commit is contained in:
Troy Denton 2024-10-22 14:47:25 +00:00 committed by Wayne Stambaugh
parent 9cc964fb37
commit 0f33aebe48
2 changed files with 2 additions and 10 deletions
common
common.cpp
include
common.h

9
common/common.cpp
View File

@ -357,14 +357,7 @@ const wxString ResolveUriByEnvVars( const wxString& aUri, PROJECT* aProject )
{
wxString uri = ExpandTextVars( aUri, aProject );
// URL-like URI: return as is.
wxURL url( uri );
if( url.GetError() == wxURL_NOERR )
return uri;
// Otherwise, the path points to a local file. Resolve environment variables if any.
return ExpandEnvVarSubstitutions( aUri, aProject );
return ExpandEnvVarSubstitutions( uri, aProject );
}

3
include/common.h
View File

@ -104,8 +104,7 @@ KICOMMON_API wxString GetTextVars( const wxString& aSource );
KICOMMON_API bool IsTextVar( const wxString& aSource );
/**
* Replace any environment and/or text variables in file-path uris (leaving network-path URIs
* alone).
* Replace any environment and/or text variables in URIs
*/
KICOMMON_API const wxString ResolveUriByEnvVars( const wxString& aUri, PROJECT* aProject );