From 79e440be814ecfeeaad7b148f0bb04d0b61b55b7 Mon Sep 17 00:00:00 2001 From: David Kelly Date: Thu, 2 Mar 2017 08:36:58 -0700 Subject: [PATCH] fix unmute when ignoring in PAL (you can't) --- interface/resources/qml/hifi/Pal.qml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml index 3bad7ee647..28384f9c1c 100644 --- a/interface/resources/qml/hifi/Pal.qml +++ b/interface/resources/qml/hifi/Pal.qml @@ -300,11 +300,14 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter onClicked: { - var newValue = !model["personalMute"]; - userModel.setProperty(model.userIndex, "personalMute", newValue) - userModelData[model.userIndex]["personalMute"] = newValue // Defensive programming - Users["personalMute"](model.sessionId, newValue) - UserActivityLogger["palAction"](newValue ? "personalMute" : "un-personalMute", model.sessionId) + // cannot change mute status when ignoring + if (!model["ignore"]) { + var newValue = !model["personalMute"]; + userModel.setProperty(model.userIndex, "personalMute", newValue) + userModelData[model.userIndex]["personalMute"] = newValue // Defensive programming + Users["personalMute"](model.sessionId, newValue) + UserActivityLogger["palAction"](newValue ? "personalMute" : "un-personalMute", model.sessionId) + } } } @@ -336,6 +339,7 @@ Rectangle { } else { delete ignored[model.sessionId] } + avgAudioVolume.glyph = avgAudioVolume.getGlyph() } // http://doc.qt.io/qt-5/qtqml-syntax-propertybinding.html#creating-property-bindings-from-javascript // I'm using an explicit binding here because clicking a checkbox breaks the implicit binding as set by