From 10f0f175c848dd5cee4ed0dfd7523e0d0d1c7821 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Tue, 23 Oct 2018 19:00:25 +0200
Subject: [PATCH] Minor fixes in login component

---
 src/blackgui/components/logincomponent.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/blackgui/components/logincomponent.cpp b/src/blackgui/components/logincomponent.cpp
index 476b8f4ae..4b837140e 100644
--- a/src/blackgui/components/logincomponent.cpp
+++ b/src/blackgui/components/logincomponent.cpp
@@ -214,11 +214,13 @@ namespace BlackGui
 
         void CLoginComponent::toggleNetworkConnection()
         {
-            if (ui->tw_Network->currentWidget() == ui->pg_FsdDetails)
+            if (!sGui || sGui->isShuttingDown()) { return; }
+            if (ui->tw_Network->currentWidget() != ui->pg_NetworkVatsim && ui->tw_Network->currentWidget() != ui->pg_OtherServers)
             {
                 this->showOverlayMessage(CStatusMessage(this).validationError("No login possible from this very tab, use VATSIM or other servers"), OverlayMessageMs);
                 return;
             }
+
             const bool isConnected = sGui && sGui->getIContextNetwork()->isConnected();
             const bool vatsimLogin = this->isVatsimNetworkTabSelected();