Browse Source

Thread safety.

pull/18/head
Jeff Young 3 months ago
parent
commit
1b21b880e6
  1. 6
      common/common.cpp

6
common/common.cpp

@ -71,7 +71,6 @@ wxString ExpandTextVars( const wxString& aSource, const PROJECT* aProject, int a
wxString ExpandTextVars( const wxString& aSource, wxString ExpandTextVars( const wxString& aSource,
const std::function<bool( wxString* )>* aResolver, int aFlags ) const std::function<bool( wxString* )>* aResolver, int aFlags )
{ {
static wxRegEx userDefinedWarningError( wxS( "^(ERC|DRC)_(WARNING|ERROR).*$" ) );
wxString newbuf; wxString newbuf;
size_t sourceLen = aSource.length(); size_t sourceLen = aSource.length();
@ -94,7 +93,10 @@ wxString ExpandTextVars( const wxString& aSource,
if( token.IsEmpty() ) if( token.IsEmpty() )
continue; continue;
if( ( aFlags & FOR_ERC_DRC ) == 0 && userDefinedWarningError.Matches( token ) )
if( ( aFlags & FOR_ERC_DRC ) == 0 && ( token.StartsWith( wxS( "ERC_WARNING" ) )
|| token.StartsWith( wxS( "ERC_ERROR" ) )
|| token.StartsWith( wxS( "DRC_WARNING" ) )
|| token.StartsWith( wxS( "DRC_ERROR" ) ) ) )
{ {
// Only show user-defined warnings/errors during ERC/DRC // Only show user-defined warnings/errors during ERC/DRC
} }

Loading…
Cancel
Save