From c21a67a14095c146ad7ce6b37c8d88bf84df9323 Mon Sep 17 00:00:00 2001
From: kaedr <kaedraar@gmail.com>
Date: Sat, 16 Oct 2021 20:16:34 -0400
Subject: [PATCH] Added handling for connection errors that occur before client
 leaves login screen

---
 voxygen/src/menu/main/ui/mod.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/voxygen/src/menu/main/ui/mod.rs b/voxygen/src/menu/main/ui/mod.rs
index fee8c40660..374422af22 100644
--- a/voxygen/src/menu/main/ui/mod.rs
+++ b/voxygen/src/menu/main/ui/mod.rs
@@ -24,6 +24,7 @@ use crate::settings::Settings;
 use common::assets::{self, AssetExt};
 use rand::{seq::SliceRandom, thread_rng};
 use std::time::Duration;
+use tracing::warn;
 
 // TODO: what is this? (showed up in rebase)
 //const COL1: Color = Color::Rgba(0.07, 0.1, 0.1, 0.9);
@@ -455,11 +456,15 @@ impl Controls {
     }
 
     fn connection_error(&mut self, error: String) {
-        if matches!(&self.screen, Screen::Connecting { .. }) {
+        if matches!(&self.screen, Screen::Connecting { .. })
+            || matches!(&self.screen, Screen::Login { .. })
+        {
             self.screen = Screen::Login {
                 screen: Box::new(login::Screen::new()),
                 error: Some(error),
             }
+        } else {
+            warn!("connection_error invoked on unhandled screen!");
         }
     }