mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-18 00:09:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix more of what I broke.

Browse source
This commit is contained in:
Jordan Woyak 2013-03-03 16:51:26 -06:00
commit c07b8a6e37
8 changed files with 97 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Source/Core/DiscIO/Src/BannerLoaderGC.h
View file

@ -19,6 +19,7 @@
#define _BANNER_LOADER_GC_H_
#include "BannerLoader.h"
#include "VolumeGC.h"
#include "StringUtil.h"
namespace DiscIO
@ -77,9 +78,7 @@ class CBannerLoaderGC
template <u32 N>
std::string GetDecodedString(const char (&data)[N])
{
auto const string_decoder = (DiscIO::IVolume::COUNTRY_JAPAN == m_country ||
DiscIO::IVolume::COUNTRY_TAIWAN == m_country) ?
SHIFTJISToUTF8 : CP1252ToUTF8;
auto const string_decoder = CVolumeGC::GetStringDecoder(m_country);
// strnlen to trim NULLs
return string_decoder(std::string(data, strnlen(data, sizeof(data))));