diff options
| author | Petr Mrázek <peterix@gmail.com> | 2020-01-08 04:41:47 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2020-01-08 04:41:47 +0100 |
| commit | f413e61cd8ca525654708499571e825c7cb3cbac (patch) | |
| tree | ee0f11491670a38b5908c41723dd3725440f318b /api | |
| parent | 3581f5384f1270b7cc31d2cc8b610c37cd3a794e (diff) | |
| download | MultiMC-f413e61cd8ca525654708499571e825c7cb3cbac.tar MultiMC-f413e61cd8ca525654708499571e825c7cb3cbac.tar.gz MultiMC-f413e61cd8ca525654708499571e825c7cb3cbac.tar.lz MultiMC-f413e61cd8ca525654708499571e825c7cb3cbac.tar.xz MultiMC-f413e61cd8ca525654708499571e825c7cb3cbac.zip | |
NOISSUE Do not crash when dependencies are customized and conflict
Diffstat (limited to 'api')
| -rw-r--r-- | api/logic/minecraft/ComponentUpdateTask.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/api/logic/minecraft/ComponentUpdateTask.cpp b/api/logic/minecraft/ComponentUpdateTask.cpp index 15003160..84c0474c 100644 --- a/api/logic/minecraft/ComponentUpdateTask.cpp +++ b/api/logic/minecraft/ComponentUpdateTask.cpp @@ -451,13 +451,17 @@ static bool getTrivialComponentChanges(const ComponentIndex & index, const Requi auto & comp = (*compIter); if(comp->getVersion() != req.equalsVersion) { - if(comp->m_dependencyOnly) - { - decision = Decision::VersionNotSame; - } - else - { + if(comp->isCustom()) { decision = Decision::LockedVersionNotSame; + } else { + if(comp->m_dependencyOnly) + { + decision = Decision::VersionNotSame; + } + else + { + decision = Decision::LockedVersionNotSame; + } } break; } |