Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CFG: Let GetSystemModel report model based on Settings:is_new_3ds #5104

Merged
merged 2 commits into from Mar 16, 2020

Conversation

B3n30
Copy link
Contributor

@B3n30 B3n30 commented Feb 22, 2020

To be consitent with the Settings CFG savegame should also report the Model based on that setting. The savegame file itself isn't altered.

Logic is:

  • If in cfg savegame any model is old and Settings:is_new_3ds is false, GetSystemModel will report the content of the savegame
  • If in cfg savegame any model is new and Settings:is_new_3ds is false, GetSystemModel will report NINTENDO_3DS_XL
  • If in cfg savegame any model is old and Settings:is_new_3ds is true, GetSystemModel will report NEW_NINTENDO_3DS_XL
  • If in cfg savegame any model is new and Settings:is_new_3ds is true, GetSystemModel will report the content of the savegame

If we create a new cfg savegame the Model type written to the savegame will be based upon Settings:is_new_3ds either NEW_NINTENDO_3DS_XL or NINTENDO_3DS_XL


This change is Reviewable

src/core/hle/service/cfg/cfg.cpp Outdated Show resolved Hide resolved
@@ -525,7 +539,7 @@ ResultCode Module::FormatConfig() {
if (!res.IsSuccess())
return res;
return RESULT_SUCCESS;
}
} // namespace Service::CFG
Copy link
Member

@zhaowenlan1779 zhaowenlan1779 Mar 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment is incorrect

@B3n30 B3n30 merged commit 590099a into citra-emu:master Mar 16, 2020
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants