From 2bdf6537c80d94287b614b8e979407b0d7b3441a Mon Sep 17 00:00:00 2001 From: sigmabeta Date: Fri, 19 Jun 2015 09:15:31 -0400 Subject: [PATCH] Android: Have non-games use their filename as a Game ID. --- .../org/dolphinemu/dolphinemu/model/GameDatabase.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 6604717d92..28ef08f32e 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 @@ -188,12 +188,20 @@ public final class GameDatabase extends SQLiteOpenHelper name = filePath.substring(filePath.lastIndexOf("/") + 1); } + String gameId = NativeLibrary.GetGameId(filePath); + + // If the game's ID field is empty, use the filename without extension. + if (gameId.isEmpty()) + { + gameId = filePath.substring(filePath.lastIndexOf("/") + 1, filePath.lastIndexOf(".")); + } + ContentValues game = Game.asContentValues(NativeLibrary.GetPlatform(filePath), name, NativeLibrary.GetDescription(filePath).replace("\n", " "), NativeLibrary.GetCountry(filePath), filePath, - NativeLibrary.GetGameId(filePath), + gameId, NativeLibrary.GetCompany(filePath)); // Try to update an existing game first.