From fffce0ca58fdc7ec8e74a000164c64c59abe7a2a Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 25 Jul 2016 18:38:25 +0200 Subject: [PATCH] Fixed: When migrating from client 2.1 to 3.0, client_default.cfg is deleted because it exists in several unfiltered BNP, see #279 --HG-- branch : develop --- .../client/ryzom_installer/src/configfile.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp index 281d38bbf..7b5f14fcf 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp @@ -699,9 +699,6 @@ bool CConfigFile::isRyzomClientInstalledIn(const QString &directory) const // directory doesn't exist if (!dir.exists()) return false; - // client_default.cfg doesn't exist - if (!dir.exists("client_default.cfg")) return false; - // current server CServer server = getServer(); @@ -714,9 +711,18 @@ bool CConfigFile::isRyzomClientInstalledIn(const QString &directory) const // check if old client is defined and exists if (!dir.exists(clientFilename)) return false; - } - // TODO: more checks + // client 2.1- + } + else + { + // client 3.0+ + + // client_default.cfg doesn't exist + if (!dir.exists("client_default.cfg")) return false; + + // TODO: more checks + } return true; }