diff options
author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2025-05-01 20:35:19 +0200 |
---|---|---|
committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2025-05-01 20:36:25 +0200 |
commit | 3f630c76de06a0cbda163342b5ae0bf166aaad9f (patch) | |
tree | 43bbede7e56d9c96beb37811bca81e34a85dca84 | |
parent | fd91ac9fbcd5a143ee52545d088f296edbd133fd (diff) | |
download | mana-3f630c76de06a0cbda163342b5ae0bf166aaad9f.tar.gz mana-3f630c76de06a0cbda163342b5ae0bf166aaad9f.tar.bz2 mana-3f630c76de06a0cbda163342b5ae0bf166aaad9f.tar.xz mana-3f630c76de06a0cbda163342b5ae0bf166aaad9f.zip |
Fixed loading of servers saved in client config
This was broken by 79e4325192f3260ed4ded264e43da8429650bf72 due to there
being a case difference between the serverTypeToString and parseType
functions, causing loaded servers to be invalid due to unknown server
type.
Closes #105
-rw-r--r-- | src/configuration.cpp | 5 | ||||
-rw-r--r-- | src/gui/serverdialog.cpp | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/configuration.cpp b/src/configuration.cpp index 5b45a21d..b27fbe31 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -303,9 +303,9 @@ static const char *serverTypeToString(ServerType type) switch (type) { case ServerType::TmwAthena: - return "TmwAthena"; + return "tmwathena"; case ServerType::ManaServ: - return "ManaServ"; + return "manaserv"; default: return ""; } @@ -521,6 +521,7 @@ void deserialize(XML::Node node, ServerInfo &server) std::string type; node.attribute("type", type); server.type = ServerInfo::parseType(type); + server.save = true; for (auto node : node.children()) { if (node.name() == "connection") { diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index 05e1665a..f5418625 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -511,13 +511,8 @@ void ServerDialog::loadServer(XML::Node serverNode) void ServerDialog::loadCustomServers() { for (auto &server : config.servers) - { if (server.isValid()) - { - server.save = true; mServers.push_back(server); - } - } } void ServerDialog::saveCustomServers(const ServerInfo ¤tServer, int index) |