Address null reference warnings

kstefanowicz · Aug 24, 2024 · 2c65fe1 · 2c65fe1
1 parent 9ae49f8
commit 2c65fe1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -620,6 +620,9 @@ private void flushPendingPoints()
 
         private void handleCustomSoundBanks(string line)
         {
+            // If the ruleset wasn't specified, assume the osu!standard ruleset.
+            parser ??= new Rulesets.Objects.Legacy.Osu.ConvertHitObjectParser(getOffsetTime(), FormatVersion);
+
             if (!parser.AvailableSampleBanks.Contains(line))
             {
                 parser.AvailableSampleBanks.Add(line);

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs
@@ -386,8 +386,9 @@ private void handleCustomSoundBanks(TextWriter writer)
 
         private void checkCustomSoundBank(HitObject h)
         {
-            string bank = h.Samples.SingleOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL)?.Bank;
-            if (!customSoundBanks.Contains(bank)
+            string? bank = h.Samples.SingleOrDefault(s => s.Name == HitSampleInfo.HIT_NORMAL)?.Bank;
+            if (bank != null
+                && !customSoundBanks.Contains(bank)
                 && bank != "none" && bank != "normal" && bank != "soft" && bank != "drum")
             {
                 customSoundBanks.Add(bank);
@@ -653,7 +654,8 @@ private int toLegacySampleBank(string? sampleBank)
                     return (int)LegacySampleBank.Drum;
 
                 default:
-                    return customSoundBanks.IndexOf(sampleBankLower) + 4;
+                    if (sampleBankLower != null) return customSoundBanks.IndexOf(sampleBankLower) + 4;
+                    return 0;
             }
         }