dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

NOISSUE Do not crash when dependencies are customized and conflict

Browse source
This commit is contained in:
Petr Mrázek 2020-01-08 04:41:47 +01:00
parent 3581f5384f
commit f413e61cd8
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
api/logic/minecraft/ComponentUpdateTask.cpp
View file

@ -451,6 +451,9 @@ static bool getTrivialComponentChanges(const ComponentIndex & index, const Requi
auto & comp = (*compIter); auto & comp = (*compIter);
if(comp->getVersion() != req.equalsVersion) if(comp->getVersion() != req.equalsVersion)
{ {
if(comp->isCustom()) {
decision = Decision::LockedVersionNotSame;
} else {
if(comp->m_dependencyOnly) if(comp->m_dependencyOnly)
{ {
decision = Decision::VersionNotSame; decision = Decision::VersionNotSame;
@ -459,6 +462,7 @@ static bool getTrivialComponentChanges(const ComponentIndex & index, const Requi
{ {
decision = Decision::LockedVersionNotSame; decision = Decision::LockedVersionNotSame;
} }
}
break; break;
} }
decision = Decision::Met; decision = Decision::Met;