From 42e5b069268321565dffb600bc69bedcecd6bbd6 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 17 Jan 2018 05:02:09 +0100 Subject: [PATCH] Ref T172, disabled x-dependency between type and eco system This makes it impossible to set some combinations --- src/blackmisc/network/server.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/blackmisc/network/server.cpp b/src/blackmisc/network/server.cpp index 30e1e674e..8f72cb2d5 100644 --- a/src/blackmisc/network/server.cpp +++ b/src/blackmisc/network/server.cpp @@ -99,7 +99,6 @@ namespace BlackMisc // cross dependency if (ecosystem.isSystem(CEcosystem::VATSIM)) { m_serverType = FSDServerVatsim; } - if (ecosystem.isSystem(CEcosystem::PrivateFSD)) { m_serverType = FSDServer; } if (ecosystem.isSystem(CEcosystem::SwiftTest)) { m_serverType = FSDServerVatsim; } return true; } @@ -123,17 +122,8 @@ namespace BlackMisc bool CServer::setServerType(CServer::ServerType serverType) { if (m_serverType == serverType) { return false; } // avoid x-dependency + // disabled x-dependency m_serverType = static_cast(serverType); - switch (m_serverType) - { - case FSDServerVatsim : m_ecosystem = CEcosystem(CEcosystem::VATSIM); break; - case FSDServer: m_ecosystem = CEcosystem(CEcosystem::PrivateFSD); break; - case VoiceServerVatsim: m_ecosystem = CEcosystem(CEcosystem::VATSIM); break; - case VoiceServer: m_ecosystem = CEcosystem(CEcosystem::PrivateFSD); break; - case WebService: m_ecosystem = CEcosystem(CEcosystem::NoSystem); break; - case Unspecified: m_ecosystem = CEcosystem(CEcosystem::Unspecified); break; - default: break; - } return true; }