PTT toggle fix. (#106)

* fixed PTT checkbox error

* fixed mic mute on exit

* format
This commit is contained in:
ykeara
2019-03-15 15:23:17 -05:00
committed by GitHub
parent 3c5cab72e5
commit db863dbec2
3 changed files with 7 additions and 3 deletions
+5 -1
View File
@@ -537,7 +537,8 @@ void OverlayController::processRoomBindings()
void OverlayController::processPushToTalkBindings() void OverlayController::processPushToTalkBindings()
{ {
const auto pushToTalkCannotChange = !m_audioTabController.pttChangeValid(); const auto pushToTalkCannotChange = !m_audioTabController.pttChangeValid();
if ( pushToTalkCannotChange ) const auto pushToTalkEnabled = m_audioTabController.pttEnabled();
if ( pushToTalkCannotChange || !pushToTalkEnabled )
{ {
return; return;
} }
@@ -698,6 +699,9 @@ void OverlayController::mainEventLoop()
vr::VRSystem()->AcknowledgeQuit_Exiting(); // Let us buy some vr::VRSystem()->AcknowledgeQuit_Exiting(); // Let us buy some
// time just in case // time just in case
m_moveCenterTabController.reset(); 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(); m_chaperoneTabController.shutdown();
Shutdown(); Shutdown();
QApplication::exit(); QApplication::exit();
+1 -1
View File
@@ -359,7 +359,7 @@ MyStackViewPage {
id: summaryPttToggle id: summaryPttToggle
text: "Push-to-Talk" text: "Push-to-Talk"
onClicked: { onClicked: {
AudioTabController.pttEnabled = checked AudioTabController.setPttEnabled(checked, true)
} }
} }
} }
@@ -11,7 +11,7 @@ ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
text: "Push-to-Talk:" text: "Push-to-Talk:"
onClicked: { onClicked: {
AudioTabController.pttEnabled = checked AudioTabController.setPttEnabled(checked, true)
} }
} }
MyToggleButton { MyToggleButton {