From ccbdb411864aaa92c10b3d7914b8161c7671d82e Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Thu, 16 Feb 2017 14:02:47 -0500 Subject: [PATCH] Remove conversion from wxString using FROM_UTF8() when loading symbols. A conversion from wxString using FROM_UTF8() was inadvertently used when loading and enumerating symbols from the legacy plugin. This conversion would break any non-ascii characters in the symbol name. Fixes lp:1664642 https://bugs.launchpad.net/kicad/+bug/1664642 --- eeschema/sch_legacy_plugin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eeschema/sch_legacy_plugin.cpp b/eeschema/sch_legacy_plugin.cpp index 25eabdc251..055a388082 100644 --- a/eeschema/sch_legacy_plugin.cpp +++ b/eeschema/sch_legacy_plugin.cpp @@ -3425,7 +3425,7 @@ void SCH_LEGACY_PLUGIN::EnumerateSymbolLib( wxArrayString& aAliasNameList, const LIB_ALIAS_MAP& aliases = m_cache->m_aliases; for( LIB_ALIAS_MAP::const_iterator it = aliases.begin(); it != aliases.end(); ++it ) - aAliasNameList.Add( FROM_UTF8( it->first.c_str() ) ); + aAliasNameList.Add( it->first ); } @@ -3438,7 +3438,7 @@ LIB_ALIAS* SCH_LEGACY_PLUGIN::LoadSymbol( const wxString& aLibraryPath, const wx cacheLib( aLibraryPath ); - LIB_ALIAS_MAP::const_iterator it = m_cache->m_aliases.find( TO_UTF8( aAliasName ) ); + LIB_ALIAS_MAP::const_iterator it = m_cache->m_aliases.find( aAliasName ); if( it == m_cache->m_aliases.end() ) return NULL;