This commit is contained in:
Igor Pavlov
2015-11-19 00:00:00 +00:00
committed by Kornel Lesiński
parent 7c8a265a15
commit e24f7fba53
70 changed files with 701 additions and 332 deletions

View File

@@ -1825,6 +1825,8 @@ HRESULT CHandler::Open2(IInStream *stream,
int prevSplitFile = -1;
int prevMainFile = -1;
bool nextVol_is_Required = false;
CInArchive arch;
for (;;)
@@ -1861,7 +1863,8 @@ HRESULT CHandler::Open2(IInStream *stream,
if (!inStream || result != S_OK)
{
_missingVolName = volName;
if (nextVol_is_Required)
_missingVolName = volName;
break;
}
}
@@ -2111,11 +2114,18 @@ HRESULT CHandler::Open2(IInStream *stream,
}
curBytes += endPos;
nextVol_is_Required = false;
if (!arcInfo.IsVolume())
break;
if (arcInfo.EndOfArchive_was_Read
&& !arcInfo.AreMoreVolumes())
break;
if (arcInfo.EndOfArchive_was_Read)
{
if (!arcInfo.AreMoreVolumes())
break;
nextVol_is_Required = true;
}
}
FillLinks();