diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-08-11 02:17:48 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-08-11 02:17:48 +0200 |
| commit | 814d5d3315ef82e9eeb7adcf71b1105c0b3afcdb (patch) | |
| tree | 88d954f0c634794e2de4614652bf99c2ed1ec016 /logic/minecraft/InstanceVersion.cpp | |
| parent | fd6706391b62294967e781c17de4ac85f665836d (diff) | |
| download | MultiMC-814d5d3315ef82e9eeb7adcf71b1105c0b3afcdb.tar MultiMC-814d5d3315ef82e9eeb7adcf71b1105c0b3afcdb.tar.gz MultiMC-814d5d3315ef82e9eeb7adcf71b1105c0b3afcdb.tar.lz MultiMC-814d5d3315ef82e9eeb7adcf71b1105c0b3afcdb.tar.xz MultiMC-814d5d3315ef82e9eeb7adcf71b1105c0b3afcdb.zip | |
Properly detect if the instance is vanilla and don't treat it as custom.
Diffstat (limited to 'logic/minecraft/InstanceVersion.cpp')
| -rw-r--r-- | logic/minecraft/InstanceVersion.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/logic/minecraft/InstanceVersion.cpp b/logic/minecraft/InstanceVersion.cpp index addbcc84..c345e1fb 100644 --- a/logic/minecraft/InstanceVersion.cpp +++ b/logic/minecraft/InstanceVersion.cpp @@ -157,8 +157,11 @@ bool InstanceVersion::removeFtbPack() bool InstanceVersion::isVanilla() { QDir patches(PathCombine(m_instance->instanceRoot(), "patches/")); - if(VersionPatches.size() >= 1) - return false; + for(auto patchptr: VersionPatches) + { + if(patchptr->isCustom()) + return false; + } if(QFile::exists(PathCombine(m_instance->instanceRoot(), "custom.json"))) return false; if(QFile::exists(PathCombine(m_instance->instanceRoot(), "version.json"))) |