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

Fix another incorrect (and useless) conversion of a wxString to and from std::string. 

This useless conversion breaks non ASCII8 strings.
This commit is contained in:
jean-pierre charras 2020-08-07 18:31:17 +02:00
parent e14bbc7d83
commit f46c1ccb32
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/settings/settings_manager.cpp
View File

@ -249,8 +249,7 @@ void SETTINGS_MANAGER::registerColorSettings( const wxString& aFilename )
{ {
if( m_color_settings.count( aFilename ) ) if( m_color_settings.count( aFilename ) )
return; return;
//wxMessageBox( aFilename, "registerColorSettings1" );
//wxMessageBox( aFilename.ToStdString().c_str(), "registerColorSettings2" );
m_color_settings[aFilename] = static_cast<COLOR_SETTINGS*>( m_color_settings[aFilename] = static_cast<COLOR_SETTINGS*>(
RegisterSettings( new COLOR_SETTINGS( aFilename ) ) ); RegisterSettings( new COLOR_SETTINGS( aFilename ) ) );
} }
@ -605,7 +604,7 @@ wxString SETTINGS_MANAGER::calculateUserSettingsPath( bool aIncludeVer, bool aUs
if( aIncludeVer ) if( aIncludeVer )
cfgpath.AppendDir( GetSettingsVersion() ); cfgpath.AppendDir( GetSettingsVersion() );
return cfgpath.GetPath().ToStdString(); return cfgpath.GetPath();
} }