diff options
author | jmarshallnz <jcmarsha@gmail.com> | 2014-08-08 07:57:17 +1200 |
---|---|---|
committer | jmarshallnz <jcmarsha@gmail.com> | 2014-08-08 07:57:17 +1200 |
commit | abffcd14a7e6d64c779c491ed16af68508fd89ae (patch) | |
tree | 5ff2888c6b1b66919ab93457160326f6563c2c09 | |
parent | ccc42594e3a79125a4a251c43f7a9e96a47b49bd (diff) | |
parent | 17ae404a363924af5e016df8a55b6c5aa9263570 (diff) |
Merge pull request #5147 from Karlson2k/fix_scraper_fixchar_01
ScraperParser::Clean: use "UTF-8" instead of GetSearchStringEncoding()
-rw-r--r-- | xbmc/utils/ScraperParser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xbmc/utils/ScraperParser.cpp b/xbmc/utils/ScraperParser.cpp index a7e23c9bc0..a6ebaba123 100644 --- a/xbmc/utils/ScraperParser.cpp +++ b/xbmc/utils/ScraperParser.cpp @@ -512,10 +512,10 @@ void CScraperParser::Clean(std::string& strDirty) { strBuffer = strDirty.substr(i+14,i2-i-14); std::wstring wbuffer; - g_charsetConverter.toW(strBuffer,wbuffer,GetSearchStringEncoding()); + g_charsetConverter.utf8ToW(strBuffer, wbuffer, false, false, false); std::wstring wConverted; HTML::CHTMLUtil::ConvertHTMLToW(wbuffer,wConverted); - g_charsetConverter.fromW(wConverted,strBuffer,GetSearchStringEncoding()); + g_charsetConverter.wToUTF8(wConverted, strBuffer, false); StringUtils::Trim(strBuffer); ConvertJSON(strBuffer); strDirty.replace(i, i2-i+14, strBuffer); |