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

Fix issue with the timeout error showing when there is an intentional logout from the game.

Browse Source
This commit is contained in:
Shane Handley 2019-10-20 14:42:54 +09:00 committed by timokoesters
parent bcd214187b
commit c9de7a0ae6
No known key found for this signature in database
GPG Key ID: CD80BE9AAEE78097
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
voxygen/src/menu/char_selection/mod.rs
View File

@ -114,12 +114,9 @@ impl PlayState for CharSelectionState {
.tick(comp::ControllerInputs::default(), clock.get_last_delta())
{
error!("Failed to tick the scene: {:?}", err);
global_state.info_message = Some(
"Connection lost!\nDid the server restart?\nIs the client up to date?"
.to_owned(),
);
return PlayStateResult::Pop;
}
self.client.borrow_mut().cleanup();
// Finish the frame.

21
voxygen/src/session.rs
View File

@ -6,7 +6,7 @@ use crate::{
window::{Event, GameInput},
Direction, Error, GlobalState, PlayState, PlayStateResult,
};
use client::{self, Client, Event::Chat};
use client::{self, error::Error as ClientError, Client, Event::Chat};
use common::{
clock::Clock,
comp,
@ -332,11 +332,20 @@ impl PlayState for SessionState {
// Perform an in-game tick.
if let Err(err) = self.tick(clock.get_avg_delta()) {
error!("Failed to tick the scene: {:?}", err);
global_state.info_message = Some(
"Connection lost!\nDid the server restart?\nIs the client up to date?"
.to_owned(),
);
match err {
Error::ClientError(ClientError::ServerTimeout) => {
global_state.info_message = Some(
"Connection lost!\nDid the server restart?\nIs the client up to date?"
.to_owned(),
);
error!("[session] ServerTimeout: {:?}", err);
}
_ => {
error!("[session] Failed to tick the scene: {:?}", err);
}
}
return PlayStateResult::Pop;
}