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 'xMAC94x/hotfix' into 'master'

Browse Source 
xmac94x/hotfix

See merge request veloren/veloren!1321
This commit is contained in:
Marcel 2020-08-22 10:33:24 +00:00
commit 25098e94ae
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
network/src/scheduler.rs
View File

@ -281,6 +281,7 @@ impl Scheduler {
.send(finished_sender)
.unwrap();
drop(pi);
trace!("dropped bparticipant, waiting for finish");
let e = finished_receiver.await.unwrap();
return_once_successful_shutdown.send(e).unwrap();
} else {
@ -561,6 +562,8 @@ impl Scheduler {
s2b_create_channel_s: s2b_create_channel_s.clone(),
s2b_shutdown_bparticipant_s: Some(s2b_shutdown_bparticipant_s),
});
drop(participants);
trace!("dropped participants lock");
pool.spawn_ok(
bparticipant
.run(participant_channels.b2s_prio_statistic_s)