From 906c999bb0cf7f47bd6f27d9b7f451f5667783cf Mon Sep 17 00:00:00 2001
From: Bernie Zang <nzang@cisco.com>
Date: Mon, 27 Mar 2017 20:55:12 -0400
Subject: [PATCH] fix(plugin-phone): Fix video/audio state issue on join

---
 packages/plugin-phone/src/call.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/plugin-phone/src/call.js b/packages/plugin-phone/src/call.js
index 915d6f5cdb4..53d19157a95 100644
--- a/packages/plugin-phone/src/call.js
+++ b/packages/plugin-phone/src/call.js
@@ -808,6 +808,7 @@ const Call = SparkPlugin.extend({
   @oneFlight
   // eslint-disable-next-line complexity
   _join(locusMethodName, target, options = {}) {
+
     if (options.localMediaStream) {
       this.media.set(`localMediaStream`, options.localMediaStream);
     }
@@ -832,13 +833,13 @@ const Call = SparkPlugin.extend({
         offerToReceiveAudio: recvOnly || !!options.constraints.audio,
         offerToReceiveVideo: recvOnly || !!options.constraints.video
       });
-
-      this.media.set({
-        audio: options.constraints.audio,
-        video: options.constraints.video
-      });
     }
 
+    this.media.set({
+      audio: options.constraints.audio,
+      video: options.constraints.video
+    });
+
     if (options.offerOptions) {
       if (options.offerOptions.offerToReceiveAudio) {
         this.media.set({offerToReceiveAudio: options.offerOptions.offerToReceiveAudio});