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

Handle the foo + foo.disabled jar mod corner case better.

Browse Source
This commit is contained in:
Petr Mrázek 2013-12-27 02:18:40 +01:00
parent aa91d89aaa
commit 4bf1cac8d8
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
logic/ModList.cpp
View File

@ -81,14 +81,24 @@ bool ModList::update()
QFileInfo infoDisabled(m_dir.filePath(item.id + ".disabled")); QFileInfo infoDisabled(m_dir.filePath(item.id + ".disabled"));
int idxEnabled = folderContents.indexOf(infoEnabled); int idxEnabled = folderContents.indexOf(infoEnabled);
int idxDisabled = folderContents.indexOf(infoDisabled); int idxDisabled = folderContents.indexOf(infoDisabled);
// if both enabled and disabled versions are present, PANIC! bool isEnabled;
// if both enabled and disabled versions are present, it's a special case...
if (idxEnabled >= 0 && idxDisabled >= 0) if (idxEnabled >= 0 && idxDisabled >= 0)
{ {
return false; // we only process the one we actually have in the order file.
// and exactly as we have it.
// THIS IS A CORNER CASE
isEnabled = item.enabled;
}
else
{
// only one is present.
// we pick the one that we found.
// we assume the mod was enabled/disabled by external means
isEnabled = idxEnabled >= 0;
} }
bool isEnabled = idxEnabled >= 0;
int idx = isEnabled ? idxEnabled : idxDisabled; int idx = isEnabled ? idxEnabled : idxDisabled;
QFileInfo info = isEnabled ? infoEnabled : infoDisabled; QFileInfo & info = isEnabled ? infoEnabled : infoDisabled;
// if the file from the index file exists // if the file from the index file exists
if (idx != -1) if (idx != -1)
{ {
@ -226,6 +236,9 @@ bool ModList::installMod(const QFileInfo &filename, int index)
int idx = mods.indexOf(m); int idx = mods.indexOf(m);
if (idx != -1) if (idx != -1)
{ {
int idx2 = mods.indexOf(m,idx+1);
if(idx2 != -1)
return false;
if (mods[idx].replace(m)) if (mods[idx].replace(m))
{ {