Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Kernel/Loader: Grab the system mode from the NCCH ExHeader.

Browse source 
3dsx and elf files default to system mode 2 (96MB allocated to the application).

This allows Home Menu to boot without modifications.
Closes #1849
This commit is contained in:
Subv 2016-11-26 23:13:40 -05:00
parent 1323ab2f5f
commit d171409f29
5 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/citra/citra.cpp
View file

@ -135,17 +135,17 @@ int main(int argc, char** argv) {
return -1;
}
u32 system_mode;
Loader::ResultStatus load_result = loader->LoadKernelSystemMode(system_mode);
if (Loader::ResultStatus::Success != load_result) {
LOG_CRITICAL(Frontend, "Failed to load ROM (Error %i)!", load_result);
boost::optional<u32> system_mode = loader->LoadKernelSystemMode();
if (!system_mode) {
LOG_CRITICAL(Frontend, "Failed to load ROM (Could not determine system mode)!");
return -1;
}
System::Init(emu_window.get(), system_mode);
System::Init(emu_window.get(), system_mode.get());
SCOPE_EXIT({ System::Shutdown(); });
load_result = loader->Load();
Loader::ResultStatus load_result = loader->Load();
if (Loader::ResultStatus::Success != load_result) {
LOG_CRITICAL(Frontend, "Failed to load ROM (Error %i)!", load_result);
return -1;