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

Give up on a cross-platform solution to non-ascii filenames. 

Sometime it might be worth giving another go at it, but for now I
just put conditional compilation in.

Fixes https://gitlab.com/kicad/code/kicad/issues/5024
This commit is contained in:
Jeff Young 2020-08-01 19:44:53 +01:00
parent 1bcc819eed
commit a58a75366e
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/settings/json_settings.cpp
View File

@ -159,7 +159,12 @@ bool JSON_SETTINGS::LoadFromFile( const std::string& aDirectory )
else else
{ {
wxString dir( aDirectory.c_str(), wxConvUTF8 ); wxString dir( aDirectory.c_str(), wxConvUTF8 );
#ifdef __WINDOWS__
path.Assign( dir, m_filename, getFileExt() ); path.Assign( dir, m_filename, getFileExt() );
#else
wxString name( m_filename.c_str(), wxConvUTF8 );
path.Assign( dir, name, getFileExt() );
#endif
} }
if( !path.Exists() ) if( !path.Exists() )