0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop

Browse Source
This commit is contained in:
Petr Mrázek 2013-12-13 02:48:31 +01:00
commit 7d20e2478a
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
logic/updater/DownloadUpdateTask.cpp
View File

@ -242,10 +242,18 @@ void DownloadUpdateTask::processFileLists()
for (VersionFileEntry newEntry : m_nVersionFileList) for (VersionFileEntry newEntry : m_nVersionFileList)
{ {
if (newEntry.path == entry.path) if (newEntry.path == entry.path)
continue; {
QLOG_DEBUG() << "Not deleting" << entry.path << "because it is still present in the new version.";
goto SkipFile;
}
} }
// If the loop reaches the end, we didn't find a match. Delete the file. // If the loop reaches the end, we didn't find a match. Delete the file.
m_operationList.append(UpdateOperation::DeleteOp(entry.path)); m_operationList.append(UpdateOperation::DeleteOp(entry.path));
SkipFile:
// We goto here from the inner loop if we find an entry that has a corresponding entry in the new version's file list.
// This allows us to effectively continue the outer loop from the inner loop.
// In this case, goto is the more readable option.
} }
// Create a network job for downloading files. // Create a network job for downloading files.