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

Don't double-up FUTURE_FORMAT_ERROR problem strings. 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/14780
This commit is contained in:
Jeff Young 2023-05-31 00:45:07 +01:00
parent 86abfd2cef
commit e82e4af483
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/exceptions.cpp
View File

@ -120,10 +120,18 @@ FUTURE_FORMAT_ERROR::FUTURE_FORMAT_ERROR( const PARSE_ERROR& aParseError,
const wxString& aRequiredVersion ) : const wxString& aRequiredVersion ) :
PARSE_ERROR() PARSE_ERROR()
{ {
init( aRequiredVersion ); if( const FUTURE_FORMAT_ERROR* ffe = dynamic_cast<const FUTURE_FORMAT_ERROR*>( &aParseError ) )
{
requiredVersion = ffe->requiredVersion;
problem = ffe->Problem();
}
else
{
init( aRequiredVersion );
if( !aParseError.Problem().IsEmpty() ) if( !aParseError.Problem().IsEmpty() )
problem += wxS( "\n\n" ) + _( "Full error text:" ) + wxS( "\n" ) + aParseError.Problem(); problem += wxS( "\n\n" ) + _( "Full error text:" ) + wxS( "\n" ) + aParseError.Problem();
}
lineNumber = aParseError.lineNumber; lineNumber = aParseError.lineNumber;
byteIndex = aParseError.byteIndex; byteIndex = aParseError.byteIndex;