From 814d5d3315ef82e9eeb7adcf71b1105c0b3afcdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 11 Aug 2014 02:17:48 +0200 Subject: Properly detect if the instance is vanilla and don't treat it as custom. --- logic/minecraft/InstanceVersion.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'logic/minecraft/InstanceVersion.cpp') 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"))) -- cgit v1.2.3