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

Changed: Keep other servers when upgrading ryzom_installer.ini

Browse source
This commit is contained in:
kervala 2016-10-17 11:20:20 +02:00
parent 377b122772
commit b860ae4428
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -106,15 +106,19 @@ bool CConfigFile::load(const QString &filename)
m_productHelpUrl = settings.value("url_help").toString(); m_productHelpUrl = settings.value("url_help").toString();
m_productComments = settings.value("comments").toString(); m_productComments = settings.value("comments").toString();
settings.endGroup(); settings.endGroup();
}
settings.beginGroup("servers"); settings.beginGroup("servers");
int serversCount = settings.value("size").toInt(); int serversCount = settings.value("size").toInt();
m_defaultServerIndex = settings.value("default").toInt(); m_defaultServerIndex = settings.value("default").toInt();
settings.endGroup(); settings.endGroup();
m_servers.resize(serversCount); // only resize if added servers in local ryzom_installer.ini
int oldServersCount = m_servers.size();
for (int i = 0; i < serversCount; ++i) if (serversCount > oldServersCount) m_servers.resize(serversCount);
for (int i = oldServersCount; i < serversCount; ++i)
{ {
CServer &server = m_servers[i]; CServer &server = m_servers[i];
@ -122,7 +126,6 @@ bool CConfigFile::load(const QString &filename)
server.loadFromSettings(settings); server.loadFromSettings(settings);
settings.endGroup(); settings.endGroup();
} }
}
// custom choices, always keep them // custom choices, always keep them
settings.beginGroup("profiles"); settings.beginGroup("profiles");