Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

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 
--HG--
branch : develop
This commit is contained in:
kervala 2016-07-25 18:38:25 +02:00
parent de01e9e559
commit fffce0ca58
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
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
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;
}