fix shift-jis conversion on linux, and check for the codepage on windows in the memorycard manager like everywhere else

This commit is contained in:
LPFaint99
2011-12-20 01:35:12 -08:00
parent de4e3e7462
commit 9ddb67d4a9
4 changed files with 25 additions and 8 deletions

View File

@ -1278,8 +1278,10 @@ void CISOProperties::ChangeBannerDetails(int lang)
WARN_LOG(COMMON, "Cannot Convert from Charset Windows Japanese cp 932");
}
#else
wxCSConv SJISConv(wxFontMapper::GetEncodingName(wxFONTENCODING_EUC_JP));
#endif
// on linux the wrong string is returned from wxFontMapper::GetEncodingName(wxFONTENCODING_SHIFT_JIS)
// it returns CP-932, in order to use iconv we need to use CP932
wxCSConv SJISConv(L"CP932");
#endif
switch (OpenGameListItem->GetCountry())
{
case DiscIO::IVolume::COUNTRY_TAIWAN: