Merge pull request #16092 from RebeccaStankus/MuteIssues

Fix for PTT not working
This commit is contained in:
Zach Fox 2019-08-23 14:47:59 -07:00 committed by GitHub
commit 860b5d0970
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -101,8 +101,8 @@ void Audio::setMutedDesktop(bool isMuted) {
}
}
});
if (!isMuted && _settingsLoaded) {
// Disable Push-To-Talk if muted is changed to false. Settings also need to be loaded.
if (!isMuted && _settingsLoaded && !_pushingToTalk) {
// If the user is not pushing to talk and muted is changed to false, disable Push-To-Talk. Settings also need to be loaded.
setPTTDesktop(isMuted);
}
if (changed) {
@ -132,8 +132,8 @@ void Audio::setMutedHMD(bool isMuted) {
}
}
});
if (!isMuted && _settingsLoaded) {
// Disable Push-To-Talk if muted is changed to false. Settings also need to be loaded.
if (!isMuted && _settingsLoaded && !_pushingToTalk) {
// If the user is not pushing to talk and muted is changed to false, disable Push-To-Talk. Settings also need to be loaded.
setPTTHMD(isMuted);
}
if (changed) {