Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 22:51:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #16092 from RebeccaStankus/MuteIssues

Browse source 
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
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/scripting/Audio.cpp
View file

@ -101,8 +101,8 @@ void Audio::setMutedDesktop(bool isMuted) {
} }
} }
}); });
if (!isMuted && _settingsLoaded) { if (!isMuted && _settingsLoaded && !_pushingToTalk) {
// Disable Push-To-Talk if muted is changed to false. Settings also need to be loaded. // 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); setPTTDesktop(isMuted);
} }
if (changed) { if (changed) {
@ -132,8 +132,8 @@ void Audio::setMutedHMD(bool isMuted) {
} }
} }
}); });
if (!isMuted && _settingsLoaded) { if (!isMuted && _settingsLoaded && !_pushingToTalk) {
// Disable Push-To-Talk if muted is changed to false. Settings also need to be loaded. // 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); setPTTHMD(isMuted);
} }
if (changed) { if (changed) {