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

Bump up the timeout tie for booting the single player server

Browse Source
This commit is contained in:
Shane Handley
2019-10-19 16:14:05 +09:00
committed by timokoesters
parent 97dda3b2ca
commit ca2b32acd6
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
voxygen/src/menu/main/client_init.rs
View File

@ -2,7 +2,7 @@ use client::{error::Error as ClientError, Client};
use common::comp; use common::comp;
use crossbeam::channel::{unbounded, Receiver, TryRecvError}; use crossbeam::channel::{unbounded, Receiver, TryRecvError};
use log::info; use log::info;
use std::sync::atomic::{Ordering, AtomicBool}; use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Arc; use std::sync::Arc;
use std::{net::ToSocketAddrs, thread, time::Duration}; use std::{net::ToSocketAddrs, thread, time::Duration};
@ -60,7 +60,8 @@ impl ClientInit {
let mut last_err = None; let mut last_err = None;
'tries: for _ in 0..=12 { // 1 Minute 'tries: for _ in 0..=60 {
// 300 Seconds
if cancel2.load(Ordering::Relaxed) { if cancel2.load(Ordering::Relaxed) {
break; break;
} }
@ -123,7 +124,7 @@ impl ClientInit {
} }
}); });
ClientInit { rx, cancel, } ClientInit { rx, cancel }
} }
/// Poll if the thread is complete. /// Poll if the thread is complete.
/// Returns None if the thread is still running, otherwise returns the Result of client creation. /// Returns None if the thread is still running, otherwise returns the Result of client creation.