More null safety

StackDoubleFlow · Jul 27, 2024 · da10a12 · da10a12
1 parent fa5eb45
commit da10a12
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Hooks/FakeNotes/BeatmapData.cpp b/src/Hooks/FakeNotes/BeatmapData.cpp
@@ -62,11 +62,11 @@ template <typename U, typename T> auto FakeCount(ArrayW<T> list, bool v2) {
 MAKE_HOOK_MATCH(V2_BeatmapDataLoader_GetBeatmapDataBasicInfoFromSaveDataJson,
                 &BeatmapDataLoaderVersion2_6_0AndEarlier::BeatmapDataLoader::GetBeatmapDataBasicInfoFromSaveDataJson,
                 GlobalNamespace::BeatmapDataBasicInfo*, StringW beatmapSaveDataJson) {
-  if (!beatmapSaveDataJson) return nullptr;
+  if (!beatmapSaveDataJson) return V2_BeatmapDataLoader_GetBeatmapDataBasicInfoFromSaveDataJson(beatmapSaveDataJson);
 
   auto beatmapSaveData =
       JsonUtility::FromJson<BeatmapSaveDataVersion2_6_0AndEarlier::BeatmapSaveData*>(beatmapSaveDataJson);
-  if (beatmapSaveData == nullptr) {
+  if (beatmapSaveData == nullptr || beatmapSaveData->notes == nullptr) {
     return nullptr;
   }
   ListW<BeatmapSaveDataVersion2_6_0AndEarlier::NoteData*> notes = beatmapSaveData->notes;