From 85ee61af9d672a5a2ff53c0ef298c5a5d6293603 Mon Sep 17 00:00:00 2001 From: RebeccaStankus Date: Fri, 23 Aug 2019 13:35:58 -0700 Subject: [PATCH 1/4] Fix for PTT not working --- interface/src/scripting/Audio.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/scripting/Audio.cpp b/interface/src/scripting/Audio.cpp index 8d9e57ad93..eefc6eec75 100644 --- a/interface/src/scripting/Audio.cpp +++ b/interface/src/scripting/Audio.cpp @@ -101,7 +101,7 @@ 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. setPTTDesktop(isMuted); } @@ -132,7 +132,7 @@ 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. setPTTHMD(isMuted); } From 63038d12c227997053c936e06534ce9f60cca225 Mon Sep 17 00:00:00 2001 From: RebeccaStankus Date: Fri, 23 Aug 2019 13:43:15 -0700 Subject: [PATCH 2/4] Fix for PTT not working comments --- interface/src/scripting/Audio.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/scripting/Audio.cpp b/interface/src/scripting/Audio.cpp index eefc6eec75..5f4889f47c 100644 --- a/interface/src/scripting/Audio.cpp +++ b/interface/src/scripting/Audio.cpp @@ -102,7 +102,7 @@ void Audio::setMutedDesktop(bool isMuted) { } }); 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 using Push-to-talk and muted is changed to false, disable Push-To-Talk. Settings also need to be loaded. setPTTDesktop(isMuted); } if (changed) { @@ -133,7 +133,7 @@ void Audio::setMutedHMD(bool isMuted) { } }); 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 using Push-to-talk and muted is changed to false, disable Push-To-Talk. Settings also need to be loaded. setPTTHMD(isMuted); } if (changed) { From f109edbd4895a88f64a698bab6702b4cac24f18e Mon Sep 17 00:00:00 2001 From: RebeccaStankus Date: Fri, 23 Aug 2019 13:45:32 -0700 Subject: [PATCH 3/4] Fix for PTT not working comments --- interface/src/scripting/Audio.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/scripting/Audio.cpp b/interface/src/scripting/Audio.cpp index 5f4889f47c..26d02b2ec5 100644 --- a/interface/src/scripting/Audio.cpp +++ b/interface/src/scripting/Audio.cpp @@ -102,7 +102,7 @@ void Audio::setMutedDesktop(bool isMuted) { } }); if (!isMuted && _settingsLoaded && !_pushingToTalk) { - // If the user is not using Push-to-talk and muted is changed to false, disable Push-To-Talk. Settings also need to be loaded. + // If the user is not using pushing to talk and muted is changed to false, disable Push-To-Talk. Settings also need to be loaded. setPTTDesktop(isMuted); } if (changed) { @@ -133,7 +133,7 @@ void Audio::setMutedHMD(bool isMuted) { } }); if (!isMuted && _settingsLoaded && !_pushingToTalk) { - // If the user is not using Push-to-talk and muted is changed to false, disable Push-To-Talk. Settings also need to be loaded. + // If the user is not using pushing to talk and muted is changed to false, disable Push-To-Talk. Settings also need to be loaded. setPTTHMD(isMuted); } if (changed) { From f6a32b931879514fda6f0f736bc8c729903be31b Mon Sep 17 00:00:00 2001 From: RebeccaStankus Date: Fri, 23 Aug 2019 13:46:46 -0700 Subject: [PATCH 4/4] Fix for PTT not working comments --- interface/src/scripting/Audio.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/scripting/Audio.cpp b/interface/src/scripting/Audio.cpp index 26d02b2ec5..ba392f0cd1 100644 --- a/interface/src/scripting/Audio.cpp +++ b/interface/src/scripting/Audio.cpp @@ -102,7 +102,7 @@ void Audio::setMutedDesktop(bool isMuted) { } }); if (!isMuted && _settingsLoaded && !_pushingToTalk) { - // If the user is not using pushing to talk and muted is changed to false, disable Push-To-Talk. 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); } if (changed) { @@ -133,7 +133,7 @@ void Audio::setMutedHMD(bool isMuted) { } }); if (!isMuted && _settingsLoaded && !_pushingToTalk) { - // If the user is not using pushing to talk and muted is changed to false, disable Push-To-Talk. 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); } if (changed) {