Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added handling for connection errors that occur before client leaves login screen

Browse Source
This commit is contained in:
kaedr
2021-10-16 20:16:34 -04:00
parent cc98ccc371
commit c8a1d821e7
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
voxygen/src/menu/main/ui/mod.rs
View File

@ -24,6 +24,7 @@ use crate::settings::Settings;
use common::assets::{self, AssetExt}; use common::assets::{self, AssetExt};
use rand::{seq::SliceRandom, thread_rng}; use rand::{seq::SliceRandom, thread_rng};
use std::time::Duration; use std::time::Duration;
use tracing::warn;
// TODO: what is this? (showed up in rebase) // TODO: what is this? (showed up in rebase)
//const COL1: Color = Color::Rgba(0.07, 0.1, 0.1, 0.9); //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) { 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 { self.screen = Screen::Login {
screen: Box::new(login::Screen::new()), screen: Box::new(login::Screen::new()),
error: Some(error), error: Some(error),
} }
} else {
warn!("connection_error invoked on unhandled screen!");
} }
} }