Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source
This commit is contained in:
kervala 2016-10-17 20:45:43 +02:00
parent bbb97b7b5b
commit a31e0b8d25
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
code/ryzom/tools/client/ryzom_installer/src/filesextractor.cpp
View file

@ -434,20 +434,30 @@ bool CFilesExtractor::extract7z()
if (!outFile.open(QFile::WriteOnly)) if (!outFile.open(QFile::WriteOnly))
{ {
error = QApplication::tr("Unable to open output file"); error = QApplication::tr("Unable to open output file %1").arg(destPath);
res = SZ_ERROR_FAIL; res = SZ_ERROR_FAIL;
break; break;
} }
size_t processedSize = outFile.write((const char*)(outBuffer + offset), outSizeProcessed); qint64 currentSizeToProcess = outSizeProcessed;
if (processedSize != outSizeProcessed) do
{ {
error = QApplication::tr("Unable to write output file"); qint64 currentProcessedSize = outFile.write((const char*)(outBuffer + offset), currentSizeToProcess);
// errors only occur when returned size is -1
if (currentProcessedSize < 0)
{
error = QApplication::tr("Unable to write output file %1").arg(destPath);
res = SZ_ERROR_FAIL; res = SZ_ERROR_FAIL;
break; break;
} }
offset += currentProcessedSize;
currentSizeToProcess -= currentProcessedSize;
}
while (currentSizeToProcess > 0);
outFile.close(); outFile.close();
totalUncompressed += SzArEx_GetFileSize(&db, i); totalUncompressed += SzArEx_GetFileSize(&db, i);