Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Adam <dev@robert-adam.de>2021-03-26 12:19:01 +0300
committerGitHub <noreply@github.com>2021-03-26 12:19:01 +0300
commit1c7706280fa749fbc8e3da83d5f37092ae52c3e2 (patch)
tree3753ee92ec0d5c432fa5c7aee682713f9bf487db
parentf8dc8b07798436dda278b172a0c62c7f8fac10d8 (diff)
parent7b0f6e7c27b306db5f7bfdc896f5d993eabcdfdf (diff)
Merge pull request #4884: FIX(client, talking-ui): No users being added
993f640 fixed a crash caused by being renamed. However it did mess up a conditional check that now prevents any users from being added to the TalkingUI. This is fixed by this commit.
-rw-r--r--src/mumble/TalkingUI.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mumble/TalkingUI.cpp b/src/mumble/TalkingUI.cpp
index 0aec811b6..03ff76b88 100644
--- a/src/mumble/TalkingUI.cpp
+++ b/src/mumble/TalkingUI.cpp
@@ -380,7 +380,7 @@ TalkingUIUser *TalkingUI::findOrAddUser(const ClientUser *user) {
bool isSelf = Global::get().uiSession == user->uiSession;
int channelIndex = findContainer(user->cChannel->iId, ContainerType::CHANNEL);
- if (channelIndex) {
+ if (channelIndex < 0) {
qCritical("TalkingUI::findOrAddUser User's channel does not exist!");
return nullptr;
}