From d171409f29ce3d8bcf7ed6ce16392b4b4ec97c4b Mon Sep 17 00:00:00 2001 From: Subv Date: Sat, 26 Nov 2016 23:13:40 -0500 Subject: Kernel/Loader: Grab the system mode from the NCCH ExHeader. 3dsx and elf files default to system mode 2 (96MB allocated to the application). This allows Home Menu to boot without modifications. Closes #1849 --- src/citra_qt/main.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/citra_qt') diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 9589da4ba..a3887f9ab 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -299,16 +299,15 @@ bool GMainWindow::LoadROM(const std::string& filename) { return false; } - u32 system_mode; - Loader::ResultStatus load_result = app_loader->LoadKernelSystemMode(system_mode); - if (Loader::ResultStatus::Success != load_result) { - LOG_CRITICAL(Frontend, "Failed to load ROM!", load_result); + boost::optional system_mode = app_loader->LoadKernelSystemMode(); + if (!system_mode) { + LOG_CRITICAL(Frontend, "Failed to load ROM!"); QMessageBox::critical(this, tr("Error while loading ROM!"), tr("Could not determine the system mode.")); return false; } - if (!InitializeSystem(system_mode)) + if (!InitializeSystem(system_mode.get())) return false; Loader::ResultStatus result = app_loader->Load(); -- cgit v1.2.3