TeaSpeak/Teaspeak-Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into 1.4.0

Browse Source
This commit is contained in:
WolverinDEV
2019-08-01 11:56:50 +02:00
parent b07933ea08 942ea44e90
commit f7cb93d768
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/client/voice/VoiceClientConnection.cpp
+4 -1
View File
@@ -352,7 +352,9 @@ unique_ptr<protocol::ClientPacket> VoiceClientConnection::next_reassembled_packe
}
if(current_packet->type() != PacketTypeInfo::Command && current_packet->type() != PacketTypeInfo::CommandLow) {
return buffer->pop_front(); /* we don't have to reassemble anything */
auto tmp = buffer->pop_front(); /* we don't have to reassemble anything */
more |= buffer->front_set(); /* set the more flag if we know that we have more of this packet */
return tmp;
}
unique_ptr<ClientPacket> final_packet;
@@ -435,6 +437,7 @@ unique_ptr<protocol::ClientPacket> VoiceClientConnection::next_reassembled_packe
}
}
more |= buffer->front_set(); /* set the more flag if we have more to process */
buffer_lock.unlock();
std::string error = "success";