aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix null reference exception from previous commit.

Browse Source
This commit is contained in:
Natalia Portillo
2020-11-05 11:02:12 +00:00
parent c94530e685
commit cea53a02bd
1 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs
View File

@@ -832,34 +832,35 @@ namespace Aaru.Core.Devices.Dumping
// TODO: Replace for error number
}
foreach(Track imgTrack in (_outputPlugin as IWritableOpticalImage).Tracks)
{
try
if((_outputPlugin as IWritableOpticalImage).Tracks != null)
foreach(Track imgTrack in (_outputPlugin as IWritableOpticalImage).Tracks)
{
byte[] isrcBytes =
(_outputPlugin as IWritableOpticalImage).ReadSectorTag(imgTrack.TrackSequence,
SectorTagType.CdTrackIsrc);
try
{
byte[] isrcBytes =
(_outputPlugin as IWritableOpticalImage).ReadSectorTag(imgTrack.TrackSequence,
SectorTagType.CdTrackIsrc);
if(isrcBytes != null)
isrcs[(byte)imgTrack.TrackSequence] = Encoding.ASCII.GetString(isrcBytes);
if(isrcBytes != null)
isrcs[(byte)imgTrack.TrackSequence] = Encoding.ASCII.GetString(isrcBytes);
}
catch(Exception)
{
// TODO: Replace for error number
}
Track trk = tracks.FirstOrDefault(t => t.TrackSequence == imgTrack.TrackSequence);
if(trk != null)
{
trk.TrackPregap = imgTrack.TrackPregap;
trk.TrackStartSector = imgTrack.TrackStartSector;
trk.TrackEndSector = imgTrack.TrackEndSector;
foreach(KeyValuePair<ushort, int> imgIdx in imgTrack.Indexes)
trk.Indexes[imgIdx.Key] = imgIdx.Value;
}
}
catch(Exception)
{
// TODO: Replace for error number
}
Track trk = tracks.FirstOrDefault(t => t.TrackSequence == imgTrack.TrackSequence);
if(trk != null)
{
trk.TrackPregap = imgTrack.TrackPregap;
trk.TrackStartSector = imgTrack.TrackStartSector;
trk.TrackEndSector = imgTrack.TrackEndSector;
foreach(KeyValuePair<ushort, int> imgIdx in imgTrack.Indexes)
trk.Indexes[imgIdx.Key] = imgIdx.Value;
}
}
// Send track list to output plugin. This may fail if subchannel is set but unsupported.
ret = (_outputPlugin as IWritableOpticalImage).SetTracks(tracks.ToList());