2 files changed, 15 insertions, 1 deletions

@@ -50,6 +50,16 @@ namespace AnodyneArchipelago.Menu
         {
             if (_connectionTask != null && _connectionTask.IsCompleted)
             {
+                if (_connectionTask.IsFaulted)
+                {
+                    _text = _connectionTask.Exception.ToString();
+                    _connectionTask = null;
+
+                    UpdateDisplay();
+
+                    return;
+                }
+
                 LoginResult result = _connectionTask.Result;
 
                 if (result.Successful)
@@ -135,7 +135,11 @@ namespace AnodyneArchipelago.Menu
         {
             if (!_hide)
             {
-                _selector.Draw();
+                if (_substate == null)
+                {
+                    _selector.Draw();
+                }
+                
                 _versionLabel1.Draw();
                 _versionLabel2.Draw();
                 _serverLabel.Draw();