fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[XAM] Fixed incorrect setting order being used.

Browse Source 
Instead of: Title->Profile->Default
It used: Title->Default
This commit is contained in:
Gliniak
2025-03-10 18:32:39 +01:00
parent 0d06cdd649
commit b9ecfd5d78
1 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/xenia/kernel/xam/user_tracker.cc
View File

@@ -520,30 +520,22 @@ const Property* UserTracker::GetProperty(const uint64_t xuid,
std::optional<UserSetting> UserTracker::GetGpdSetting( std::optional<UserSetting> UserTracker::GetGpdSetting(
UserProfile* user, uint32_t title_id, uint32_t setting_id) const { UserProfile* user, uint32_t title_id, uint32_t setting_id) const {
if (!spa_data_) { auto game_gpd = user->games_gpd_.find(title_id);
// There is no data about current title. Use dashboard info. if (game_gpd != user->games_gpd_.cend()) {
auto setting = user->dashboard_gpd_.GetSetting(setting_id); auto setting = game_gpd->second.GetSetting(setting_id);
if (!setting) { if (setting) {
return std::nullopt; return std::make_optional<UserSetting>(
setting, game_gpd->second.GetSettingData(setting_id));
} }
}
auto setting = user->dashboard_gpd_.GetSetting(setting_id);
if (setting) {
return std::make_optional<UserSetting>( return std::make_optional<UserSetting>(
setting, user->dashboard_gpd_.GetSettingData(setting_id)); setting, user->dashboard_gpd_.GetSettingData(setting_id));
} }
auto game_gpd = user->games_gpd_.find(title_id); return std::nullopt;
if (game_gpd == user->games_gpd_.cend()) {
return std::nullopt;
}
auto setting = game_gpd->second.GetSetting(setting_id);
if (!setting) {
// Refer to default values
return std::nullopt;
}
return std::make_optional<UserSetting>(
setting, game_gpd->second.GetSettingData(setting_id));
} }
std::optional<UserSetting> UserTracker::GetSetting(UserProfile* user, std::optional<UserSetting> UserTracker::GetSetting(UserProfile* user,