Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show "self mute/deaf", "global mute/deaf", "prio speaker", "user left channe… #1945

Closed
wants to merge 2 commits into from

Conversation

Natenom
Copy link
Contributor

@Natenom Natenom commented Dec 1, 2015

…l and disconnected" states in linked channels.

…l and disconnected states in linked channels.
@@ -319,7 +319,7 @@ void MainWindow::msgUserState(const MumbleProto::UserState &msg) {
if (msg.has_self_deaf())
pDst->setSelfDeaf(msg.self_deaf());

if (pSelf && pDst != pSelf && (pDst->cChannel == pSelf->cChannel)) {
if ((pSelf && pDst != pSelf && (pDst->cChannel == pSelf->cChannel)) || (pSelf && pDst != pSelf && ((pDst->cChannel->allLinks().contains(pSelf->cChannel))))) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we simplify this one to be like the ones below?

I.e., something like:

if (pSelf && pDst != pSelf && ((pDst->cChannel == pSelf->cChannel) || pDst->cChannel->allLinks().contains(pSelf->cChannel))) {

@mkrautz
Copy link
Contributor

mkrautz commented Dec 25, 2015

LGTM with my comments fixed

@mkrautz
Copy link
Contributor

mkrautz commented Dec 26, 2015

Landed as b83316a.

@mkrautz mkrautz closed this Dec 26, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants