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

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

Browse Source
This commit is contained in:
Petr Mrázek 2019-06-15 22:47:36 +02:00
commit e8bf9cef24
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/logic/minecraft/SimpleModList.cpp
View File

@ -123,8 +123,8 @@ bool SimpleModList::installMod(const QString &filename)
qDebug() << "Cannot recognize mod type of" << originalPath << ", ignoring it."; qDebug() << "Cannot recognize mod type of" << originalPath << ", ignoring it.";
return false; return false;
} }
auto newpath = FS::NormalizePath(FS::PathCombine(m_dir.path(), fileinfo.fileName()));
auto newpath = FS::NormalizePath(FS::PathCombine(m_dir.path(), fileinfo.fileName()));
if(originalPath == newpath) if(originalPath == newpath)
{ {
qDebug() << "Overwriting the mod (" << originalPath << ") with itself makes no sense..."; qDebug() << "Overwriting the mod (" << originalPath << ") with itself makes no sense...";
@ -133,7 +133,7 @@ bool SimpleModList::installMod(const QString &filename)
if (type == Mod::MOD_SINGLEFILE || type == Mod::MOD_ZIPFILE || type == Mod::MOD_LITEMOD) if (type == Mod::MOD_SINGLEFILE || type == Mod::MOD_ZIPFILE || type == Mod::MOD_LITEMOD)
{ {
if(QFile::exists(newpath)) if(QFile::exists(newpath) || QFile::exists(newpath.append(".disabled")))
{ {
if(!QFile::remove(newpath)) if(!QFile::remove(newpath))
{ {