mirror of
https://port.numenaute.org/aleajactaest/khanat-code-old.git
synced 2024-11-12 18:29:02 +00:00
Changed: Keep other servers when upgrading ryzom_installer.ini
This commit is contained in:
parent
7140cb40a7
commit
d776a00980
1 changed files with 17 additions and 14 deletions
|
@ -106,22 +106,25 @@ 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();
|
||||||
|
|
||||||
|
// only resize if added servers in local ryzom_installer.ini
|
||||||
|
int oldServersCount = m_servers.size();
|
||||||
|
|
||||||
|
if (serversCount > oldServersCount) m_servers.resize(serversCount);
|
||||||
|
|
||||||
|
for (int i = oldServersCount; i < serversCount; ++i)
|
||||||
|
{
|
||||||
|
CServer &server = m_servers[i];
|
||||||
|
|
||||||
|
settings.beginGroup(QString("server_%1").arg(i));
|
||||||
|
server.loadFromSettings(settings);
|
||||||
settings.endGroup();
|
settings.endGroup();
|
||||||
|
|
||||||
m_servers.resize(serversCount);
|
|
||||||
|
|
||||||
for (int i = 0; i < serversCount; ++i)
|
|
||||||
{
|
|
||||||
CServer &server = m_servers[i];
|
|
||||||
|
|
||||||
settings.beginGroup(QString("server_%1").arg(i));
|
|
||||||
server.loadFromSettings(settings);
|
|
||||||
settings.endGroup();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// custom choices, always keep them
|
// custom choices, always keep them
|
||||||
|
|
Loading…
Reference in a new issue