mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 06:09:50 -06:00
Merge pull request #7816 from JosJuice/titledatabase-edge-cases
Fix edge cases in TitleDatabase, cover downloading, Gecko code downloading
This commit is contained in:
@ -26,8 +26,8 @@
|
||||
#include "UICommon/GameFile.h"
|
||||
|
||||
GeckoCodeWidget::GeckoCodeWidget(const UICommon::GameFile& game, bool restart_required)
|
||||
: m_game(game), m_game_id(game.GetGameID()), m_game_revision(game.GetRevision()),
|
||||
m_restart_required(restart_required)
|
||||
: m_game(game), m_game_id(game.GetGameID()), m_gametdb_id(game.GetGameTDBID()),
|
||||
m_game_revision(game.GetRevision()), m_restart_required(restart_required)
|
||||
{
|
||||
CreateWidgets();
|
||||
ConnectWidgets();
|
||||
@ -251,7 +251,7 @@ void GeckoCodeWidget::DownloadCodes()
|
||||
{
|
||||
bool success;
|
||||
|
||||
std::vector<Gecko::GeckoCode> codes = Gecko::DownloadCodes(m_game_id, &success);
|
||||
std::vector<Gecko::GeckoCode> codes = Gecko::DownloadCodes(m_gametdb_id, &success);
|
||||
|
||||
if (!success)
|
||||
{
|
||||
|
@ -48,6 +48,7 @@ private:
|
||||
|
||||
const UICommon::GameFile& m_game;
|
||||
std::string m_game_id;
|
||||
std::string m_gametdb_id;
|
||||
u16 m_game_revision;
|
||||
|
||||
CheatWarningWidget* m_warning;
|
||||
|
@ -43,6 +43,7 @@
|
||||
#include "Core/TitleDatabase.h"
|
||||
#include "Core/WiiUtils.h"
|
||||
|
||||
#include "DiscIO/Enums.h"
|
||||
#include "DiscIO/NANDImporter.h"
|
||||
#include "DiscIO/WiiSaveBanner.h"
|
||||
|
||||
@ -1038,11 +1039,12 @@ void MenuBar::CheckNAND()
|
||||
{
|
||||
std::string title_listings;
|
||||
Core::TitleDatabase title_db;
|
||||
const DiscIO::Language language = SConfig::GetInstance().GetCurrentLanguage(true);
|
||||
for (const u64 title_id : result.titles_to_remove)
|
||||
{
|
||||
title_listings += StringFromFormat("%016" PRIx64, title_id);
|
||||
|
||||
const std::string database_name = title_db.GetChannelName(title_id);
|
||||
const std::string database_name = title_db.GetChannelName(title_id, language);
|
||||
if (!database_name.empty())
|
||||
{
|
||||
title_listings += " - " + database_name;
|
||||
|
Reference in New Issue
Block a user