From 65e8ba82323ab149b0732b0e8e5774efd50b1a38 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Tue, 6 Dec 2022 12:26:47 +0000 Subject: [PATCH] Fix setting track indexes in AaruFormat when a disc contains a hidden track. --- Aaru.Images/AaruFormat/Read.cs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/Aaru.Images/AaruFormat/Read.cs b/Aaru.Images/AaruFormat/Read.cs index 4d00c5bc7..9dc1ee4a3 100644 --- a/Aaru.Images/AaruFormat/Read.cs +++ b/Aaru.Images/AaruFormat/Read.cs @@ -1370,13 +1370,20 @@ public sealed partial class AaruFormat foreach(Track track in Tracks.OrderBy(t => t.StartSector)) { - if(track.Sequence == 1) + switch(track.Sequence) { - track.Pregap = 150; - track.Indexes[0] = -150; - track.Indexes[1] = (int)track.StartSector; + case 0: + track.Pregap = 150; + track.Indexes[0] = -150; + track.Indexes[1] = (int)track.StartSector; - continue; + continue; + case 1 when Tracks.All(t => t.Sequence != 0): + track.Pregap = 150; + track.Indexes[0] = -150; + track.Indexes[1] = (int)track.StartSector; + + continue; } if(track.Pregap > 0)