Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GH-887 fix patch file removal

Browse Source
This commit is contained in:
Petr Mrázek 2015-04-13 23:26:52 +02:00
parent 4d8f068f9c
commit 28aa8f342e
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
logic/minecraft/MinecraftProfile.cpp
View File

@ -99,10 +99,14 @@ bool MinecraftProfile::canRemove(const int index) const
bool MinecraftProfile::remove(const int index) bool MinecraftProfile::remove(const int index)
{ {
if (!canRemove(index)) if (!canRemove(index))
{
qDebug() << "Patch" << index << "is non-removable";
return false; return false;
}
if(!m_strategy->removePatch(VersionPatches.at(index))) if(!m_strategy->removePatch(VersionPatches.at(index)))
{ {
qCritical() << "Patch" << index << "could not be removed";
return false; return false;
} }

17
logic/minecraft/OneSixProfileStrategy.cpp
View File

@ -186,6 +186,15 @@ bool OneSixProfileStrategy::removePatch(ProfilePatchPtr patch)
bool ok = true; bool ok = true;
// first, remove the patch file. this ensures it's not used anymore // first, remove the patch file. this ensures it's not used anymore
auto fileName = patch->getPatchFilename(); auto fileName = patch->getPatchFilename();
if(fileName.size())
{
QFile patchFile(fileName);
if(patchFile.exists() && !patchFile.remove())
{
qCritical() << "File" << fileName << "could not be removed because:" << patchFile.errorString();
return false;
}
}
auto preRemoveJarMod = [&](JarmodPtr jarMod) -> bool auto preRemoveJarMod = [&](JarmodPtr jarMod) -> bool
@ -194,7 +203,13 @@ bool OneSixProfileStrategy::removePatch(ProfilePatchPtr patch)
QFileInfo finfo (fullpath); QFileInfo finfo (fullpath);
if(finfo.exists()) if(finfo.exists())
{ {
return QFile::remove(fullpath); QFile jarModFile(fullpath);
if(!jarModFile.remove())
{
qCritical() << "File" << fullpath << "could not be removed because:" << jarModFile.errorString();
return false;
}
return true;
} }
return true; return true;
}; };