mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4306: FIX(talking-ui): Fix glitch on session reuse

Browse Source 
Until now the TalkingUI assumed that session IDs of users are unique
throughout the server's lifetime. This turned out to be wrong as the
server reuses session IDs of disconnected users.

This could lead to a new user being shown with the name of an old user
in the TalkingUI as that new user was reusing the old's session ID.

With this commit a user gets deleted from the TalkingUI if it
disconnects from the server.
This commit is contained in:
Robert Adam 2020-06-26 08:22:41 +02:00 committed by GitHub
commit e17ebbbc7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mumble/TalkingUI.cpp
View File

@ -207,7 +207,9 @@ void TalkingUI::addUser(const ClientUser *user) {
// exists in this UI.
addChannel(user->cChannel);
if (!m_entries.contains(user->uiSession)) {
if (!m_entries.contains(user->uiSession) || m_entries[user->uiSession].name->text() != user->qsName) {
// We also verify whether the name for that user matches up (if it is contained in m_entries) in case
// a user didn't get removed from the map but its ID got reused by a new client.
bool isSelf = g.uiSession == user->uiSession;
// Create an Entry for this user (alongside the respective labels)
// We initially set the labels to not be visible, so that we'll
@ -702,6 +704,9 @@ void TalkingUI::on_clientDisconnected(unsigned int userSession) {
// If the user that just disconnected is contained in the TalkingUI, make sure
// it is hidden.
hideUser(userSession);
// Delete the user's entry from the TalkingUI
m_entries.remove(userSession);
}
}