aboutsummaryrefslogtreecommitdiffstats
path: root/mumd/src/network
diff options
context:
space:
mode:
authorEskil Queseth <eskilq@kth.se>2020-10-16 01:43:13 +0200
committerEskil Queseth <eskilq@kth.se>2020-10-16 01:43:13 +0200
commit7e8e67edb7d6ac66fd6073c55053a4e8234710e8 (patch)
tree4c8e04f4b1a031adaf46d39197675d4e500338bd /mumd/src/network
parentd38696eaef440f551fde00e91d73e192d1e8e89b (diff)
parent18a3c0b3cf8254b70857e31ddd2b6213b10db156 (diff)
downloadmum-7e8e67edb7d6ac66fd6073c55053a4e8234710e8.tar.gz
Merge remote-tracking branch 'origin/main' into error-handling
Diffstat (limited to 'mumd/src/network')
-rw-r--r--mumd/src/network/tcp.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/mumd/src/network/tcp.rs b/mumd/src/network/tcp.rs
index 6a369e5..ea4ef86 100644
--- a/mumd/src/network/tcp.rs
+++ b/mumd/src/network/tcp.rs
@@ -286,8 +286,8 @@ async fn listen(
ControlPacket::UserState(msg) => {
let mut state = state.lock().unwrap();
let session = msg.get_session();
- state.audio_mut().add_client(msg.get_session()); //TODO
if *state.phase_receiver().borrow() == StatePhase::Connecting {
+ state.audio_mut().add_client(msg.get_session());
state.parse_initial_user_state(*msg);
} else {
state.server_mut().unwrap().parse_user_state(*msg);