Merge pull request #5102 from leoetlino/channel-title-type

Check whether WAD is a channel before reading names
This commit is contained in:
Anthony
2017-03-18 23:30:27 -07:00
committed by GitHub
4 changed files with 12 additions and 1 deletions

View File

@ -130,6 +130,9 @@ Platform CVolumeWAD::GetVolumeType() const
std::map<Language, std::string> CVolumeWAD::GetLongNames() const
{
if (!m_tmd.IsValid() || !IOS::ES::IsChannel(m_tmd.GetTitleId()))
return {};
std::vector<u8> name_data(NAMES_TOTAL_BYTES);
if (!Read(m_opening_bnr_offset + 0x9C, NAMES_TOTAL_BYTES, name_data.data()))
return std::map<Language, std::string>();