From db863dbec27eab86ff739d15608f315d55481ec4 Mon Sep 17 00:00:00 2001
From: ykeara <ykeara1@gmail.com>
Date: Fri, 15 Mar 2019 15:23:17 -0500
Subject: [PATCH] PTT toggle fix. (#106)

* fixed PTT checkbox error

* fixed mic mute on exit

* format
---
 src/overlaycontroller.cpp                          | 6 +++++-
 src/res/qml/RootPage.qml                           | 2 +-
 src/res/qml/audio_page/push_to_talk/PttButtons.qml | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/overlaycontroller.cpp b/src/overlaycontroller.cpp
index fe1d84c..0d40f4b 100644
--- a/src/overlaycontroller.cpp
+++ b/src/overlaycontroller.cpp
@@ -537,7 +537,8 @@ void OverlayController::processRoomBindings()
 void OverlayController::processPushToTalkBindings()
 {
     const auto pushToTalkCannotChange = !m_audioTabController.pttChangeValid();
-    if ( pushToTalkCannotChange )
+    const auto pushToTalkEnabled = m_audioTabController.pttEnabled();
+    if ( pushToTalkCannotChange || !pushToTalkEnabled )
     {
         return;
     }
@@ -698,6 +699,9 @@ void OverlayController::mainEventLoop()
             vr::VRSystem()->AcknowledgeQuit_Exiting(); // Let us buy some
                                                        // time just in case
             m_moveCenterTabController.reset();
+            // Un-mute mic before Exiting VR, as it is set at system level Not
+            // Vr level.
+            m_audioTabController.setMicMuted( false, false );
             m_chaperoneTabController.shutdown();
             Shutdown();
             QApplication::exit();
diff --git a/src/res/qml/RootPage.qml b/src/res/qml/RootPage.qml
index 1603d40..c891262 100644
--- a/src/res/qml/RootPage.qml
+++ b/src/res/qml/RootPage.qml
@@ -359,7 +359,7 @@ MyStackViewPage {
                            id: summaryPttToggle
                            text: "Push-to-Talk"
                            onClicked: {
-                               AudioTabController.pttEnabled = checked
+                                AudioTabController.setPttEnabled(checked, true)
                            }
                        }
                    }
diff --git a/src/res/qml/audio_page/push_to_talk/PttButtons.qml b/src/res/qml/audio_page/push_to_talk/PttButtons.qml
index 130b6a0..3ad93b1 100644
--- a/src/res/qml/audio_page/push_to_talk/PttButtons.qml
+++ b/src/res/qml/audio_page/push_to_talk/PttButtons.qml
@@ -11,7 +11,7 @@ ColumnLayout {
             Layout.fillWidth: true
             text: "Push-to-Talk:"
             onClicked: {
-                AudioTabController.pttEnabled = checked
+                AudioTabController.setPttEnabled(checked, true)
             }
         }
         MyToggleButton {