From da8f8e0873e9371212e36694798b87bdd9a529fe Mon Sep 17 00:00:00 2001
From: Wayne Chen <chen.wayne@outlook.com>
Date: Thu, 18 Apr 2019 14:46:08 -0700
Subject: [PATCH] real fix

---
 interface/src/scripting/Audio.cpp | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/interface/src/scripting/Audio.cpp b/interface/src/scripting/Audio.cpp
index 0a29152c7c..ce340f2665 100644
--- a/interface/src/scripting/Audio.cpp
+++ b/interface/src/scripting/Audio.cpp
@@ -174,9 +174,11 @@ void Audio::setPTTDesktop(bool enabled) {
             _pttDesktop = enabled;
         }
     });
-    if (!enabled && _settingsLoaded) {
-        // Set to default behavior (unmuted for Desktop) on Push-To-Talk disable.
-        setMutedDesktop(true);
+    if (!enabled) {
+        if (_settingsLoaded) {
+            // Set to default behavior (unmuted for Desktop) on Push-To-Talk disable.
+            setMutedDesktop(true);
+        }
     } else {
         // Should be muted when not pushing to talk while PTT is enabled.
         setMutedDesktop(true);
@@ -202,9 +204,11 @@ void Audio::setPTTHMD(bool enabled) {
             _pttHMD = enabled;
         }
     });
-    if (!enabled && _settingsLoaded) {
-        // Set to default behavior (unmuted for HMD) on Push-To-Talk disable.
-        setMutedHMD(false);
+    if (!enabled) {
+        if (_settingsLoaded) {
+            // Set to default behavior (unmuted for HMD) on Push-To-Talk disable.
+            setMutedHMD(false);
+        }
     } else {
         // Should be muted when not pushing to talk while PTT is enabled.
         setMutedHMD(true);
@@ -358,11 +362,6 @@ void Audio::onContextChanged() {
             changed = true;
         }
     });
-    if (isHMD) {
-        setMuted(getMutedHMD());
-    } else {
-        setMuted(getMutedDesktop());
-    }
     if (changed) {
         emit contextChanged(isHMD ? Audio::HMD : Audio::DESKTOP);
     }