vlc/vlc-2.2 | branch: master | Erwan Tulou <[email protected]> | Fri Jun 12 12:19:36 2015 +0200| [2367cfe8a98324d84a1967b32de6f34e5652148f] | committer: Erwan Tulou
skins2: fix wrong FromLocale() file is already utf8 encoded, since it is a string that comes from the theme.xml description file, and therefore it is expected to be utf8. (cherry picked from commit ab806efc95b8378fab3b8b7aed78da07957269a1) Signed-off-by: Erwan Tulou <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=2367cfe8a98324d84a1967b32de6f34e5652148f --- modules/gui/skins2/parser/builder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gui/skins2/parser/builder.cpp b/modules/gui/skins2/parser/builder.cpp index 7d8ae77..5b7d1a7 100644 --- a/modules/gui/skins2/parser/builder.cpp +++ b/modules/gui/skins2/parser/builder.cpp @@ -1259,7 +1259,7 @@ string Builder::getFilePath( const string &rFileName ) const file.replace( pos, 1, sep ); #endif - string full_path = m_path + sep + sFromLocale( file ); + string full_path = m_path + sep + file; // check that the file exists struct stat stat; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
