Merge pull request #2573 from sigmabeta/android-show-filenames

Android: Show filenames for games with an empty title.

1 files changed, 9 insertions, 1 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameDatabase.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameDatabase.java
index 3d597b7ac3..4c2bffed0d 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameDatabase.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameDatabase.java
@@ -152,8 +152,16 @@ public final class GameDatabase extends SQLiteOpenHelper
 						// Check that the file has an extension we care about before trying to read out of it.
 						if (allowedExtensions.contains(fileExtension))
 						{
+							String name = NativeLibrary.GetTitle(filePath);
+
+							// If the game's title field is empty, use the filename.
+							if (name.isEmpty())
+							{
+								name = filePath.substring(filePath.lastIndexOf("/") + 1);
+							}
+
 							ContentValues game = Game.asContentValues(NativeLibrary.GetPlatform(filePath),
-									NativeLibrary.GetTitle(filePath),
+									name,
 									NativeLibrary.GetDescription(filePath).replace("\n", " "),
 									NativeLibrary.GetCountry(filePath),
 									filePath,