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

Support for wchar_t Windows filenames in JSON settings.

This commit is contained in:
Jeff Young 2020-07-31 21:00:31 +01:00
parent 23e834fdb5
commit 61c817377f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/settings/json_settings.cpp
View File

@ -188,8 +188,8 @@ bool JSON_SETTINGS::LoadFromFile( const std::string& aDirectory )
{ {
try try
{ {
std::ifstream in( path.GetFullPath().ToUTF8() ); FILE* fp = wxFopen( path.GetFullPath(), wxT( "rt" ) );
in >> *this; *static_cast<nlohmann::json*>( this ) = nlohmann::json::parse( fp );
// If parse succeeds, check if schema migration is required // If parse succeeds, check if schema migration is required
int filever = -1; int filever = -1;
@ -352,12 +352,12 @@ bool JSON_SETTINGS::SaveToFile( const std::string& aDirectory, bool aForce )
try try
{ {
std::ofstream file( path.GetFullPath().ToUTF8() ); wxFile file( path.GetFullPath(), wxFile::write );
file << std::setw( 2 ) << *this << std::endl;
} if( !file.IsOpened() || !file.Write( wxString( dump( 0 ).c_str(), wxConvUTF8 ) ) )
catch( const std::exception& e )
{ {
wxLogTrace( traceSettings, "Warning: could not save %s: %s", GetFullFilename(), e.what() ); wxLogTrace( traceSettings, "Warning: could not save %s", GetFullFilename() );
}
} }
catch( ... ) catch( ... )
{ {