From bf71334ee1f0b194d5ef692f1abe6bf65eab3300 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 22 Mar 2015 16:46:10 +0300 Subject: Dont use server type in server comparator. --- src/gui/windows/serverdialog.cpp | 1 + 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); } -- cgit v1.2.3-60-g2f50