Skip to content
Permalink
Browse files

Merge PR #3559: Messages: fix user registration status not being updated

  • Loading branch information...
davidebeatrici committed Dec 9, 2018
2 parents 9b19e60 + bb245f8 commit 1a95cff63acf974ba3385a114f205ea57209b4be
Showing with 4 additions and 4 deletions.
  1. +4 −4 src/mumble/Messages.cpp
@@ -286,10 +286,6 @@ void MainWindow::msgUserState(const MumbleProto::UserState &msg) {
pmModel->moveUser(pDst, channel);
}

if (msg.has_user_id()) {
pmModel->setUserId(pDst, msg.user_id());
}

if (msg.has_hash()) {
pmModel->setHash(pDst, u8(msg.hash()));
}
@@ -303,6 +299,10 @@ void MainWindow::msgUserState(const MumbleProto::UserState &msg) {
}
}

if (msg.has_user_id()) {
pmModel->setUserId(pDst, msg.user_id());
}

if (channel) {
Channel *oldChannel = pDst->cChannel;
if (channel != oldChannel) {

0 comments on commit 1a95cff

Please sign in to comment.
You can’t perform that action at this time.