From d5bf6f1bbc89d9e7fad9a09c4c159906f2521e90 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Mon, 26 Jun 2017 22:19:51 +0200 Subject: DolphinWX: Sync custom title changes on game list rescan --- Source/Core/DolphinWX/ISOFile.cpp | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'Source/Core/DolphinWX/ISOFile.cpp') diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp index 5f01889a29..48359e1485 100644 --- a/Source/Core/DolphinWX/ISOFile.cpp +++ b/Source/Core/DolphinWX/ISOFile.cpp @@ -61,7 +61,7 @@ static std::string GetLanguageString(DiscIO::Language language, return ""; } -GameListItem::GameListItem(const std::string& filename, const Core::TitleDatabase& title_database) +GameListItem::GameListItem(const std::string& filename) : m_file_name(filename), m_region(DiscIO::Region::UNKNOWN_REGION), m_country(DiscIO::Country::COUNTRY_UNKNOWN) { @@ -100,14 +100,6 @@ GameListItem::GameListItem(const std::string& filename, const Core::TitleDatabas if (m_company.empty() && m_game_id.size() >= 6) m_company = DiscIO::GetCompanyFromID(m_game_id.substr(4, 2)); - if (IsValid()) - { - const auto type = m_platform == DiscIO::Platform::WII_WAD ? - Core::TitleDatabase::TitleType::Channel : - Core::TitleDatabase::TitleType::Other; - m_custom_name = title_database.GetTitleName(m_game_id, type); - } - if (!IsValid() && IsElfOrDol()) { m_valid = true; @@ -147,6 +139,20 @@ bool GameListItem::IsValid() const return true; } +bool GameListItem::CustomNameChanged(const Core::TitleDatabase& title_database) +{ + const auto type = m_platform == DiscIO::Platform::WII_WAD ? + Core::TitleDatabase::TitleType::Channel : + Core::TitleDatabase::TitleType::Other; + m_pending.custom_name = title_database.GetTitleName(m_game_id, type); + return m_custom_name != m_pending.custom_name; +} + +void GameListItem::CustomNameCommit() +{ + m_custom_name = m_pending.custom_name; +} + bool GameListItem::EmuStateChanged() { IniFile ini = SConfig::LoadGameIni(m_game_id, m_revision); -- cgit v1.2.3 From 7d801d61dcc71e8f81e6d022e0c60ece2c5a7456 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Tue, 27 Jun 2017 10:21:33 +0200 Subject: DolphinWX: Use std::move when committing in GameListItem --- Source/Core/DolphinWX/ISOFile.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/DolphinWX/ISOFile.cpp') diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp index 48359e1485..3b607e8cf2 100644 --- a/Source/Core/DolphinWX/ISOFile.cpp +++ b/Source/Core/DolphinWX/ISOFile.cpp @@ -150,7 +150,7 @@ bool GameListItem::CustomNameChanged(const Core::TitleDatabase& title_database) void GameListItem::CustomNameCommit() { - m_custom_name = m_pending.custom_name; + m_custom_name = std::move(m_pending.custom_name); } bool GameListItem::EmuStateChanged() @@ -163,7 +163,7 @@ bool GameListItem::EmuStateChanged() void GameListItem::EmuStateCommit() { - m_emu_state = m_pending.emu_state; + m_emu_state = std::move(m_pending.emu_state); } void GameListItem::EmuState::DoState(PointerWrap& p) -- cgit v1.2.3