From 97066e453c25f6360cb5abae38e7be7d4c2c2d19 Mon Sep 17 00:00:00 2001
From: ykeara <ykeara1@gmail.com>
Date: Sun, 15 Mar 2020 13:56:41 -0500
Subject: [PATCH] fixed audio override key unset issues (#374)

* fixed audio override key unset issues

* Add apt-transport-https to CircleCI config

CircleCI fails with
E: The method driver /usr/lib/apt/methods/https could not be found.

when attempting to get the LLVM key.
This is suspected to happen because of an update to the image.

Co-authored-by: Vasily <vautkin@teknik.io>
---
 .circleci/config.yml                      | 4 ++--
 src/tabcontrollers/AudioTabController.cpp | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a564638..d3b034e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,7 +17,7 @@ update_and_install_prereqs: &update_and_install_prereqs
         name: Get wget and apt-key
         command: |
             apt-get install wget -y
-            apt-get install software-properties-common -y
+            apt-get install software-properties-common apt-transport-https -y
     - run:
         name: Set up LLVM-8 repo
         command: |
@@ -86,7 +86,7 @@ jobs:
                 name: Get apt-key
                 # Required for LLVM
                 command: |
-                    sudo apt-get install software-properties-common -y
+                    sudo apt-get install software-properties-common apt-transport-https -y
             - run:
                 name: Get LLVM repos
                 command: |
diff --git a/src/tabcontrollers/AudioTabController.cpp b/src/tabcontrollers/AudioTabController.cpp
index 5e08656..0026508 100644
--- a/src/tabcontrollers/AudioTabController.cpp
+++ b/src/tabcontrollers/AudioTabController.cpp
@@ -967,6 +967,8 @@ void AudioTabController::initOverride()
         LOG( ERROR ) << "Could not get recording override setting: "
                      << vr::VRSettings()->GetSettingsErrorNameFromEnum(
                             vrSettingsError );
+        LOG( INFO ) << "Setting recording override to false";
+        setRecordingOverride( false );
     }
     else
     {
@@ -981,6 +983,8 @@ void AudioTabController::initOverride()
         LOG( ERROR ) << "Could not get playback override setting: "
                      << vr::VRSettings()->GetSettingsErrorNameFromEnum(
                             vrSettingsError );
+        LOG( INFO ) << "Setting playback override to false";
+        setPlaybackOverride( false );
     }
     else
     {