Merge pull request #2439 from JosJuice/company-from-id

Use an ID-to-name map when volume has no company string
This commit is contained in:
Ryan Houdek
2015-05-25 23:32:55 -04:00
5 changed files with 411 additions and 4 deletions

View File

@ -301,10 +301,9 @@ static std::string GetCompany(std::string filename)
DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(filename);
if (pVolume != nullptr)
{
std::string date = pVolume->GetCompany();
__android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Company: %s", date.c_str());
return date;
std::string company = DiscIO::GetCompanyFromID(pVolume->GetMakerID());
__android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Company: %s", company.c_str());
return company;
}
return std::string ("");
}