diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-11-29 12:34:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-29 12:34:02 -0500 |
| commit | 80c4743754eecf7505b00c114e5f072b8a3277b3 (patch) | |
| tree | e679bb0f20be0666a8b09bcf9eac336145d8e9fb | |
| parent | 498159d719a4a22b1bbd5da6159541b813cc4b25 (diff) | |
| parent | fd29227bc4f84417785d409ee704872707d9ec32 (diff) | |
Merge pull request #12203 from liamwhite/crash-fix
set: don't load version nca with null romfs
| -rw-r--r-- | src/core/hle/service/set/set_sys.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/hle/service/set/set_sys.cpp b/src/core/hle/service/set/set_sys.cpp index f5edfdc8b..48304e6d1 100644 --- a/src/core/hle/service/set/set_sys.cpp +++ b/src/core/hle/service/set/set_sys.cpp @@ -34,7 +34,9 @@ Result GetFirmwareVersionImpl(FirmwareVersionFormat& out_firmware, Core::System& nca = bis_system->GetEntry(FirmwareVersionSystemDataId, FileSys::ContentRecordType::Data); } if (nca) { - romfs = FileSys::ExtractRomFS(nca->GetRomFS()); + if (auto nca_romfs = nca->GetRomFS(); nca_romfs) { + romfs = FileSys::ExtractRomFS(nca_romfs); + } } if (!romfs) { romfs = FileSys::ExtractRomFS( |