From f46c1ccb324ef3bb76917a2f7bbb17304ba9ff53 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Fri, 7 Aug 2020 18:31:17 +0200 Subject: [PATCH] Fix another incorrect (and useless) conversion of a wxString to and from std::string. This useless conversion breaks non ASCII8 strings. --- common/settings/settings_manager.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common/settings/settings_manager.cpp b/common/settings/settings_manager.cpp index eb2f37a0b5..7e27eaf2c9 100644 --- a/common/settings/settings_manager.cpp +++ b/common/settings/settings_manager.cpp @@ -249,8 +249,7 @@ void SETTINGS_MANAGER::registerColorSettings( const wxString& aFilename ) { if( m_color_settings.count( aFilename ) ) return; -//wxMessageBox( aFilename, "registerColorSettings1" ); -//wxMessageBox( aFilename.ToStdString().c_str(), "registerColorSettings2" ); + m_color_settings[aFilename] = static_cast( RegisterSettings( new COLOR_SETTINGS( aFilename ) ) ); } @@ -605,7 +604,7 @@ wxString SETTINGS_MANAGER::calculateUserSettingsPath( bool aIncludeVer, bool aUs if( aIncludeVer ) cfgpath.AppendDir( GetSettingsVersion() ); - return cfgpath.GetPath().ToStdString(); + return cfgpath.GetPath(); }