Skip to content

Commit b3321f9

Browse files
committed
Keep tweaking extraction
1 parent 428c269 commit b3321f9

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

SabreTools.Serialization/Wrappers/MicrosoftCabinet.cs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -557,24 +557,22 @@ private static CompressionType GetCompressionType(CFFOLDER folder)
557557
CFDATA[] prevBlocks = [];
558558
if (!skipPrev && spanPrev)
559559
{
560-
var prev = OpenPrevious(filename);
561-
if (prev?.Header != null && prev.Folders != null)
560+
if (Prev?.Header != null && Prev.Folders != null)
562561
{
563-
int prevFolderIndex = prev.FolderCount;
564-
var prevFolder = prev.Folders[prevFolderIndex - 1];
565-
prevBlocks = prev.GetDataBlocks(filename, prevFolder, prevFolderIndex, skipNext: true) ?? [];
562+
int prevFolderIndex = Prev.FolderCount;
563+
var prevFolder = Prev.Folders[prevFolderIndex - 1];
564+
prevBlocks = Prev.GetDataBlocks(filename, prevFolder, prevFolderIndex, skipNext: true) ?? [];
566565
}
567566
}
568567

569568
// Check if the folder spans forward
570569
CFDATA[] nextBlocks = [];
571570
if (!skipNext && spanNext)
572571
{
573-
var next = OpenNext(filename);
574-
if (next?.Model?.Header != null && next.Folders != null)
572+
if (Next?.Header != null && Next.Folders != null)
575573
{
576-
var nextFolder = next.Folders[0];
577-
nextBlocks = next.GetDataBlocks(filename, nextFolder, 0, skipPrev: true) ?? [];
574+
var nextFolder = Next.Folders[0];
575+
nextBlocks = Next.GetDataBlocks(filename, nextFolder, 0, skipPrev: true) ?? [];
578576
}
579577
}
580578

0 commit comments

Comments
 (0)