Merge branch 'xMAC94x/voxygen_panic' into 'master'

do a clear teardown of tokio runtime

See merge request veloren/veloren!2028
This commit is contained in:
Marcel 2021-03-29 10:02:09 +00:00
commit b0376c690f

View File

@ -115,6 +115,7 @@ impl ClientInit {
break 'tries; break 'tries;
} }
let _ = tx.send(Msg::Done(Ok(client))); let _ = tx.send(Msg::Done(Ok(client)));
tokio::task::block_in_place(move || drop(runtime2));
return; return;
}, },
Err(ClientError::NetworkErr(NetworkError::ConnectFailed( Err(ClientError::NetworkErr(NetworkError::ConnectFailed(