From 6e538300c18a02e74cbad520885fc56a64a89016 Mon Sep 17 00:00:00 2001 From: Gliniak Date: Thu, 9 Jan 2020 15:09:43 +0100 Subject: [PATCH] Revert "[XAM/User] Added title_id == 0 check for few User functions" This reverts commit 05433007c536f8310ca0d5d005413de5bbc743fa. --- src/xenia/kernel/xam/xam_user.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/xenia/kernel/xam/xam_user.cc b/src/xenia/kernel/xam/xam_user.cc index fd4e7e32e..4600067c1 100644 --- a/src/xenia/kernel/xam/xam_user.cc +++ b/src/xenia/kernel/xam/xam_user.cc @@ -254,7 +254,7 @@ dword_result_t XamUserReadProfileSettings( auto gpd = user_profile->GetDashboardGpd(); if (title_id != kDashboardID) { - gpd = user_profile->GetTitleGpd(!title_id ? kernel_state()->title_id() : title_id); + gpd = user_profile->GetTitleGpd(title_id); } // First call asks for size (fill buffer_size_ptr). @@ -403,8 +403,7 @@ dword_result_t XamUserWriteProfileSettings( auto gpd = user_profile->GetDashboardGpd(); if (title_id != kDashboardID) { - gpd = user_profile->GetTitleGpd(!title_id ? kernel_state()->title_id() - : title_id); + gpd = user_profile->GetTitleGpd(title_id); } if (!gpd) { @@ -606,9 +605,7 @@ dword_result_t XamUserCreateAchievementEnumerator(dword_t title_id, *handle_ptr = e->handle(); // Copy achievements into the enumerator if game GPD is loaded - auto* game_gpd = user_profile->GetTitleGpd( - !title_id ? kernel_state()->title_id() : title_id); - + auto* game_gpd = user_profile->GetTitleGpd(title_id); if (!game_gpd) { XELOGE( "XamUserCreateAchievementEnumerator failed to find GPD for title %X!",