diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-03-22 16:46:10 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-03-22 16:46:10 +0300 |
| commit | bf71334ee1f0b194d5ef692f1abe6bf65eab3300 (patch) | |
| tree | e0b1f1bbefd48874baee530f2c8b7e0bca96b4b8 | |
| parent | e327c0f591dbc602376d85659e666cdbdd62b386 (diff) | |
| download | plus-bf71334ee1f0b194d5ef692f1abe6bf65eab3300.tar.gz plus-bf71334ee1f0b194d5ef692f1abe6bf65eab3300.tar.bz2 plus-bf71334ee1f0b194d5ef692f1abe6bf65eab3300.tar.xz plus-bf71334ee1f0b194d5ef692f1abe6bf65eab3300.zip | |
Dont use server type in server comparator.
| -rw-r--r-- | src/gui/windows/serverdialog.cpp | 1 | ||||
| -rw-r--r-- | src/net/serverinfo.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index a5f8efb95..2f50a4744 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -578,6 +578,7 @@ void ServerDialog::loadServers(const bool addNew) { // Use the name listed in the server list mServers[i].name = server.name; + mServers[i].type = server.type; mServers[i].version = server.version; mServers[i].description = server.description; mServers[i].registerUrl = server.registerUrl; diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h index a17e5b3b2..e96f7d8ea 100644 --- a/src/net/serverinfo.h +++ b/src/net/serverinfo.h @@ -116,13 +116,13 @@ class ServerInfo final bool operator==(const ServerInfo &other) const { - return (type == other.type && hostname == other.hostname && + return (name == other.name && hostname == other.hostname && port == other.port); } bool operator!=(const ServerInfo &other) const { - return (type != other.type || hostname != other.hostname || + return (name != other.name || hostname != other.hostname || port != other.port); } |