aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2026-02-04 00:44:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not try to merge negative or overflow sectors if secondary image lacks them.

Browse Source
This commit is contained in:
Natalia Portillo
2025-12-29 17:07:32 +00:00
parent 19b5be908c
commit dd159d6126
1 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Aaru.Core/Image/Merge/Merger.cs
View File

@@ -243,15 +243,9 @@ public sealed partial class Merger
true &&
(primaryImage as IOpticalMediaImage)?.Sessions?.Count > 1)
{
// TODO: Disabled until 6.0
/*if(!_force)
{*/
StoppingErrorMessage?.Invoke(Localization.Core.Output_format_does_not_support_sessions);
return ErrorNumber.UnsupportedMedia;
/*}
StoppingErrorMessage?.Invoke("Output format does not support sessions, this will end in a loss of data, continuing...");*/
}
// Check for hidden tracks support in optical media
@@ -260,15 +254,9 @@ public sealed partial class Merger
true &&
(primaryImage as IOpticalMediaImage)?.Tracks?.Any(static t => t.Sequence == 0) == true)
{
// TODO: Disabled until 6.0
/*if(!_force)
{*/
StoppingErrorMessage?.Invoke(Localization.Core.Output_format_does_not_support_hidden_tracks);
return ErrorNumber.UnsupportedMedia;
/*}
StoppingErrorMessage?.Invoke("Output format does not support sessions, this will end in a loss of data, continuing...");*/
}
// Create the output image file with appropriate settings
@@ -418,9 +406,8 @@ public sealed partial class Merger
if(errno != ErrorNumber.NoError) return errno;
errno = CopyNegativeSectorsSecondary(useLong, secondaryImage, outputFormat, overrideNegativeSectorsList);
if(errno != ErrorNumber.NoError) return errno;
if(secondaryImage.Info.NegativeSectors > 0)
CopyNegativeSectorsSecondary(useLong, secondaryImage, outputFormat, overrideNegativeSectorsList);
}
if(nominalOverflowSectors > 0)
@@ -437,9 +424,8 @@ public sealed partial class Merger
if(errno != ErrorNumber.NoError) return errno;
errno = CopyOverflowSectorsSecondary(useLong, secondaryImage, outputFormat, overrideOverflowSectorsList);
if(errno != ErrorNumber.NoError) return errno;
if(secondaryImage.Info.OverflowSectors > 0)
CopyOverflowSectorsSecondary(useLong, secondaryImage, outputFormat, overrideOverflowSectorsList);
}
bool ret;