From c1208dd68c3641b8a7a3c1dc235ee7675f61a97e Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Wed, 27 Jun 2018 01:12:16 +0200
Subject: [PATCH] Return const &

---
 src/blackcore/airspacemonitor.cpp    | 10 ++++++++--
 src/blackcore/airspacemonitor.h      |  5 ++++-
 src/blackcore/network.h              |  2 +-
 src/blackcore/vatsim/networkvatlib.h |  2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp
index c7d834988..0046af023 100644
--- a/src/blackcore/airspacemonitor.cpp
+++ b/src/blackcore/airspacemonitor.cpp
@@ -1027,12 +1027,18 @@ namespace BlackCore
         return m_network && m_network->isConnected();
     }
 
-    const CServer CAirspaceMonitor::getConnectedServer() const
+    const CServer &CAirspaceMonitor::getConnectedServer() const
     {
-        if (!this->isConnected()) { return CServer(); }
+        static const CServer empty;
+        if (!this->isConnected()) { return empty; }
         return m_network->getPresetServer();
     }
 
+    const CEcosystem &CAirspaceMonitor::getCurrentEcosystem() const
+    {
+        return this->getConnectedServer().getEcosystem();
+    }
+
     bool CAirspaceMonitor::supportsVatsimDataFile() const
     {
         const bool dataFile = sApp && sApp->getWebDataServices() && sApp->getWebDataServices()->getVatsimDataFileReader();
diff --git a/src/blackcore/airspacemonitor.h b/src/blackcore/airspacemonitor.h
index 79aef0209..0926a3d7e 100644
--- a/src/blackcore/airspacemonitor.h
+++ b/src/blackcore/airspacemonitor.h
@@ -195,7 +195,10 @@ namespace BlackCore
         bool isConnected() const;
 
         //! Get the currently connected server
-        const BlackMisc::Network::CServer getConnectedServer() const;
+        const BlackMisc::Network::CServer &getConnectedServer() const;
+
+        //! Current ECO system of connected server
+        const BlackMisc::Network::CEcosystem &getCurrentEcosystem() const;
 
         //! Supports VATSIM data file
         //! \remark depends on currently connected Ecosystem
diff --git a/src/blackcore/network.h b/src/blackcore/network.h
index 3a8e5620e..8a1c46c63 100644
--- a/src/blackcore/network.h
+++ b/src/blackcore/network.h
@@ -160,7 +160,7 @@ namespace BlackCore
         /*!
          * Get preset server.
          */
-        virtual BlackMisc::Network::CServer getPresetServer() const = 0;
+        virtual const BlackMisc::Network::CServer &getPresetServer() const = 0;
 
         /*!
          * Returns true if the current ConnectionStatus is in transition, e.g. connecting.
diff --git a/src/blackcore/vatsim/networkvatlib.h b/src/blackcore/vatsim/networkvatlib.h
index 3f5c34f4b..27a39bcc3 100644
--- a/src/blackcore/vatsim/networkvatlib.h
+++ b/src/blackcore/vatsim/networkvatlib.h
@@ -79,7 +79,7 @@ namespace BlackCore
             //! \name Network functions
             //! @{
             virtual bool isConnected() const override { return m_status == vatStatusConnected; }
-            virtual BlackMisc::Network::CServer getPresetServer() const override { return m_server; }
+            virtual const BlackMisc::Network::CServer &getPresetServer() const override { return m_server; }
             virtual bool isPendingConnection() const override { return m_status == vatStatusConnecting; }
             virtual void presetLoginMode(LoginMode mode) override;
             virtual void presetServer(const BlackMisc::Network::CServer &server) override;