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

Merge branch 'sharp/fix-mismatched-server-info' into 'master'

Browse Source 
Fix swallowed network error messages.

See merge request veloren/veloren!3606
This commit is contained in:
Joshua Yanovski 2022-09-08 11:58:10 +00:00
commit fbb7d888fe
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
voxygen/src/menu/main/mod.rs
View File

@ -415,7 +415,9 @@ fn get_client_msg_error(
// and server version it is almost definitely due to this mismatch rather than
// a true networking error.
let net_error = |error: String, mismatched_server_info: Option<ServerInfo>| -> String {
if let Some(server_info) = mismatched_server_info {
if let Some(server_info) =
mismatched_server_info.filter(|info| info.git_hash != *common::util::GIT_HASH)
{
format!(
"{} {}: {} ({}) {}: {} ({})",
localization.get_msg("main-login-network_wrong_version"),