From 8c0eb1e4d27f4d925317a09fedf7632138f9172e Mon Sep 17 00:00:00 2001
From: David Kelly <david@highfidelity.io>
Date: Fri, 15 Jul 2016 19:48:15 -0700
Subject: [PATCH] Fixed some bad logic

When I "fixed" my or instead of and issue, I did it in the wrong
direction.  But it looked right :)  Now it is.  Sigh.  Long story
how it got there, but it seems good now.
---
 libraries/audio/src/AudioInjector.cpp | 14 +++++++-------
 libraries/audio/src/AudioInjector.h   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libraries/audio/src/AudioInjector.cpp b/libraries/audio/src/AudioInjector.cpp
index e992e3c541..9c49ce66d8 100644
--- a/libraries/audio/src/AudioInjector.cpp
+++ b/libraries/audio/src/AudioInjector.cpp
@@ -32,8 +32,8 @@ AudioInjectorState operator& (AudioInjectorState lhs, AudioInjectorState rhs) {
     return static_cast<AudioInjectorState>(static_cast<uint8_t>(lhs) & static_cast<uint8_t>(rhs));
 };
 
-AudioInjectorState& operator&= (AudioInjectorState& lhs, AudioInjectorState rhs) {
-    lhs = static_cast<AudioInjectorState>(static_cast<uint8_t>(lhs) & static_cast<uint8_t>(rhs));
+AudioInjectorState& operator|= (AudioInjectorState& lhs, AudioInjectorState rhs) {
+    lhs = static_cast<AudioInjectorState>(static_cast<uint8_t>(lhs) | static_cast<uint8_t>(rhs));
     return lhs;
 };
 
@@ -70,7 +70,7 @@ void AudioInjector::setOptions(const AudioInjectorOptions& options) {
 }
 
 void AudioInjector::finishNetworkInjection() {
-    _state &= AudioInjectorState::NetworkInjectionFinished;
+    _state |= AudioInjectorState::NetworkInjectionFinished;
     
     // if we are already finished with local
     // injection, then we are finished
@@ -80,14 +80,14 @@ void AudioInjector::finishNetworkInjection() {
 }
 
 void AudioInjector::finishLocalInjection() {
-    _state &= AudioInjectorState::LocalInjectionFinished;
+    _state |= AudioInjectorState::LocalInjectionFinished;
     if(_options.localOnly || stateHas(AudioInjectorState::NetworkInjectionFinished)) {
         finish();
     }
 }
 
 void AudioInjector::finish() {
-    _state &= AudioInjectorState::Finished;
+    _state |= AudioInjectorState::Finished;
 
     emit finished();
 
@@ -413,7 +413,7 @@ void AudioInjector::triggerDeleteAfterFinish() {
     if (_state == AudioInjectorState::Finished) {
         stopAndDeleteLater();
     } else {
-        _state &= AudioInjectorState::PendingDelete;
+        _state |= AudioInjectorState::PendingDelete;
     }
 }
 
@@ -459,7 +459,7 @@ AudioInjector* AudioInjector::playSoundAndDelete(const QByteArray& buffer, const
     AudioInjector* sound = playSound(buffer, options, localInterface);
 
     if (sound) {
-        sound->_state &= AudioInjectorState::PendingDelete;
+        sound->_state |= AudioInjectorState::PendingDelete;
     }
 
     return sound;
diff --git a/libraries/audio/src/AudioInjector.h b/libraries/audio/src/AudioInjector.h
index ce0c88247e..9bdfcacb5c 100644
--- a/libraries/audio/src/AudioInjector.h
+++ b/libraries/audio/src/AudioInjector.h
@@ -42,7 +42,7 @@ enum class AudioInjectorState : uint8_t {
 };
 
 AudioInjectorState operator& (AudioInjectorState lhs, AudioInjectorState rhs);
-AudioInjectorState& operator&= (AudioInjectorState& lhs, AudioInjectorState rhs);
+AudioInjectorState& operator|= (AudioInjectorState& lhs, AudioInjectorState rhs);
 
 // In order to make scripting cleaner for the AudioInjector, the script now holds on to the AudioInjector object
 // until it dies.