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

NOISSUE do not fail when the Flame overrides folder is missing

Browse Source
This commit is contained in:
Petr Mrázek 2017-09-26 01:36:52 +02:00
parent a269e0c92f
commit f26ca143c4
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/logic/InstanceImportTask.cpp
View File

@ -200,11 +200,18 @@ void InstanceImportTask::processFlame()
if(!pack.overrides.isEmpty()) if(!pack.overrides.isEmpty())
{ {
QString overridePath = FS::PathCombine(m_stagingPath, pack.overrides); QString overridePath = FS::PathCombine(m_stagingPath, pack.overrides);
QString mcPath = FS::PathCombine(m_stagingPath, "minecraft"); if (QFile::exists(overridePath))
if (!QFile::rename(overridePath, mcPath))
{ {
emitFailed(tr("Could not rename the overrides folder:\n") + pack.overrides); QString mcPath = FS::PathCombine(m_stagingPath, "minecraft");
return; if (!QFile::rename(overridePath, mcPath))
{
emitFailed(tr("Could not rename the overrides folder:\n") + pack.overrides);
return;
}
}
else
{
qWarning() << "The specified overrides folder is missing. Maybe the modpack was already used before?";
} }
} }