Don't play an engaged tone if we hang up locally.

1 files changed, 8 insertions, 3 deletions

diff --git a/webclient/components/matrix/matrix-call.js b/webclient/components/matrix/matrix-call.js
index ae20b7650e..aae00a3f77 100644
--- a/webclient/components/matrix/matrix-call.js
+++ b/webclient/components/matrix/matrix-call.js
@@ -58,12 +58,13 @@ angular.module('MatrixCall', [])
         this.didConnect = false;
     }
 
-    MatrixCall.prototype.placeCall = function() {
+    MatrixCall.prototype.placeCall = function(config) {
         self = this;
         matrixPhoneService.callPlaced(this);
-        navigator.getUserMedia({audio: true, video: false}, function(s) { self.gotUserMediaForInvite(s); }, function(e) { self.getUserMediaFailed(e); });
-        self.state = 'wait_local_media';
+        navigator.getUserMedia({audio: config.audio, video: config.video}, function(s) { self.gotUserMediaForInvite(s); }, function(e) { self.getUserMediaFailed(e); });
+        this.state = 'wait_local_media';
         this.direction = 'outbound';
+        this.config = config;
     };
 
     MatrixCall.prototype.initWithInvite = function(msg) {
@@ -105,6 +106,8 @@ angular.module('MatrixCall', [])
         this.stopAllMedia();
         this.peerConn.close();
 
+        this.hangupParty = 'local';
+
         var content = {
             version: 0,
             call_id: this.call_id,
@@ -285,6 +288,7 @@ angular.module('MatrixCall', [])
         self = this;
         $rootScope.$apply(function() {
             self.state = 'ended';
+            this.hangupParty = 'remote';
             self.stopAllMedia();
             this.peerConn.close();
             self.onHangup();
@@ -300,6 +304,7 @@ angular.module('MatrixCall', [])
 
     MatrixCall.prototype.onHangupReceived = function() {
         this.state = 'ended';
+        this.hangupParty = 'remote';
         this.stopAllMedia();
         this.peerConn.close();
         this.onHangup();