Don't load game INIs in Core::Init #4713
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Parlane
reviewed
Jan 22, 2017
Source/Core/Core/BootManager.cpp
Outdated
| @@ -272,14 +269,19 @@ bool BootCore(const std::string& _rFilename) | |||
| controls_section->Get(StringFromFormat("PadType%u", i), &source, -1); | |||
| if (source >= SIDEVICE_NONE && source < SIDEVICE_COUNT) | |||
| { | |||
| SConfig::GetInstance().m_SIDevice[i] = (SIDevices)source; | |||
| StartUp.m_SIDevice[i] = (SIDevices)source; | |||
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
JosJuice
force-pushed
the
core-init-gameini
branch
from
17d09e4
to
0a10f4f
Compare
The game INIs are already loaded in BootManager::BootCore, which is executed right before. Let's put the g_aspect_wide code there instead.
JosJuice
force-pushed
the
core-init-gameini
branch
from
0a10f4f
to
edcf681
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The game INIs are already loaded in BootManager::BootCore, which is executed right before. Let's put the g_aspect_wide code there instead.