Merge 18.06 in Easy7Zip

This commit is contained in:
glachancecmaisonneuve
2019-02-19 23:45:59 -05:00
118 changed files with 3058 additions and 2868 deletions

View File

@@ -101,8 +101,10 @@ HRESULT CThreadExtracting::ProcessVirt()
CDecompressStat Stat;
#ifndef _SFX
/*
if (HashBundle)
HashBundle->Init();
*/
#endif
HRESULT res = Extract(codecs,
@@ -121,7 +123,7 @@ HRESULT CThreadExtracting::ProcessVirt()
{
AddValuePair(Pairs, IDS_ARCHIVES_COLON, Stat.NumArchives);
AddSizeValuePair(Pairs, IDS_PROP_PACKED_SIZE, Stat.PackSize);
AddHashBundleRes(Pairs, *HashBundle, UString());
AddHashBundleRes(Pairs, *HashBundle);
}
else if (Options->TestMode)
{