Made some changes from review comments:
- Made LoadKernelSystemMode return a pair consisting of a system mode and a result code (Could use review). - Deleted ErrorOpenGL error code in favor of just having ErrorVideoCore. - Made dialog messages more clear. - Compared archive ID in fs_user.cpp to ArchiveIdCode::NCCH as opposed to hex magic. - Cleaned up some other stuff.
This commit is contained in:
parent
1ecb322daa
commit
37bec598ea
10 changed files with 55 additions and 53 deletions
|
@ -257,11 +257,9 @@ ResultVal<ArchiveHandle> OpenArchive(ArchiveIdCode id_code, FileSys::Path& archi
|
|||
LOG_TRACE(Service_FS, "Opening archive with id code 0x%08X", id_code);
|
||||
|
||||
auto itr = id_code_map.find(id_code);
|
||||
if (itr == id_code_map.end()) {
|
||||
// TODO: Verify error against hardware
|
||||
return ResultCode(ErrorDescription::NotFound, ErrorModule::FS, ErrorSummary::NotFound,
|
||||
ErrorLevel::Permanent);
|
||||
}
|
||||
if (itr == id_code_map.end())
|
||||
return ResultCode(ErrorDescription::FS_NotFound, ErrorModule::FS, ErrorSummary::NotFound,
|
||||
ErrorLevel::Status);
|
||||
|
||||
CASCADE_RESULT(std::unique_ptr<ArchiveBackend> res, itr->second->Open(archive_path));
|
||||
|
||||
|
|
|
@ -133,12 +133,11 @@ static void OpenFileDirectly(Service::Interface* self) {
|
|||
LOG_ERROR(Service_FS,
|
||||
"failed to get a handle for archive archive_id=0x%08X archive_path=%s",
|
||||
static_cast<u32>(archive_id), archive_path.DebugStr().c_str());
|
||||
if (static_cast<u32>(archive_id) == 0x2345678A) {
|
||||
Core::System::GetInstance().SetStatus(Core::System::ResultStatus::ErrorSystemFiles);
|
||||
return;
|
||||
}
|
||||
cmd_buff[1] = archive_handle.Code().raw;
|
||||
cmd_buff[3] = 0;
|
||||
if (static_cast<FS::ArchiveIdCode>(archive_id) == ArchiveIdCode::NCCH) {
|
||||
Core::System::GetInstance().SetStatus(Core::System::ResultStatus::ErrorSystemFiles);
|
||||
}
|
||||
return;
|
||||
}
|
||||
SCOPE_EXIT({ CloseArchive(*archive_handle); });
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue