CommonHostInterface: Prefer serial from database, not image

src/frontend-common/common_host_interface.cpp

@@ -2861,15 +2861,19 @@ void CommonHostInterface::GetGameInfo(const char* path, CDImage* image, std::str
   }
   else
   {
-    if (image)
-      *code = System::GetGameCodeForImage(image, true);
-
     GameDatabase database;
     GameDatabaseEntry database_entry;
     if (database.Load() && database.GetEntryForDisc(image, &database_entry))
+    {
+      *code = std::move(database_entry.serial);
       *title = std::move(database_entry.title);
+    }
     else
+    {
       *title = System::GetTitleForPath(path);
+      if (image)
+        *code = System::GetGameCodeForImage(image, true);
+    }
   }
 }
 

src/frontend-common/game_list.h

@@ -103,8 +103,6 @@ public:
   const GameListEntry* GetEntryForPath(const char* path) const;
   const GameListCompatibilityEntry* GetCompatibilityEntryForCode(const std::string& code) const;
 
-  bool GetGameCodeAndTitleFromDatabase(const char* path, std::string* code, std::string* title);
-
   void SetCacheFilename(std::string filename) { m_cache_filename = std::move(filename); }
   void SetUserCompatibilityListFilename(std::string filename)
   {