aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-12-29 20:30:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed: When migrating from client 2.1 to 3.0, client_default.cfg is deleted because it exists in several unfiltered BNP, see #279

Browse source
This commit is contained in:
kervala 2016-07-25 18:38:25 +02:00
parent 9eb6c89733
commit 190f72d95f
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
code/ryzom/tools/client/ryzom_installer/src/configfile.cpp
View file

@ -699,9 +699,6 @@ bool CConfigFile::isRyzomClientInstalledIn(const QString &directory) const
// directory doesn't exist // directory doesn't exist
if (!dir.exists()) return false; if (!dir.exists()) return false;
// client_default.cfg doesn't exist
if (!dir.exists("client_default.cfg")) return false;
// current server // current server
CServer server = getServer(); CServer server = getServer();
@ -714,9 +711,18 @@ bool CConfigFile::isRyzomClientInstalledIn(const QString &directory) const
// check if old client is defined and exists // check if old client is defined and exists
if (!dir.exists(clientFilename)) return false; if (!dir.exists(clientFilename)) return false;
// client 2.1-
} }
else
{
// client 3.0+
// client_default.cfg doesn't exist
if (!dir.exists("client_default.cfg")) return false;
// TODO: more checks // TODO: more checks
}
return true; return true;
} }