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

Use an ID-to-name map when volume has no company string

1 files changed, 3 insertions, 4 deletions

diff --git a/Source/Core/DolphinWX/MainAndroid.cpp b/Source/Core/DolphinWX/MainAndroid.cpp
index 884472a13c..97956512e3 100644
--- a/Source/Core/DolphinWX/MainAndroid.cpp
+++ b/Source/Core/DolphinWX/MainAndroid.cpp
@@ -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 ("");
 }