diff --git a/BizHawk.Emulation.Cores/Sound/CDAudio.cs b/BizHawk.Emulation.Cores/Sound/CDAudio.cs index 39efff363f..00030a4611 100644 --- a/BizHawk.Emulation.Cores/Sound/CDAudio.cs +++ b/BizHawk.Emulation.Cores/Sound/CDAudio.cs @@ -71,6 +71,10 @@ namespace BizHawk.Emulation.Cores.Components { var track = Disc.Session1.SeekTrack(lba); if (track == null) return; + // returning Leadout means no sound is playing + // and since we don't have any information about where leadout ends + // return in this case as well to avoid track.Number+1 below + if (track == Disc.Session1.LeadoutTrack) return; PlayingTrack = track.Number; StartLBA = lba; @@ -242,4 +246,4 @@ namespace BizHawk.Emulation.Cores.Components EnsureSector(); } } -} \ No newline at end of file +}