Don't break if you press the hangup button before allowing media permission.

2 files changed, 3 insertions, 2 deletions

diff --git a/webclient/components/matrix/matrix-call.js b/webclient/components/matrix/matrix-call.js

index aae00a3f77..ef35717da6 100644
--- a/webclient/components/matrix/matrix-call.js
+++ b/webclient/components/matrix/matrix-call.js
@@ -104,7 +104,7 @@ angular.module('MatrixCall', [])
         console.trace("Ending call "+this.call_id);
 
         this.stopAllMedia();
-        this.peerConn.close();
+        if (this.peerConn) this.peerConn.close();
 
         this.hangupParty = 'local';
 
diff --git a/webclient/index.html b/webclient/index.html

index 53ac1cb10e..3b531027e1 100644
--- a/webclient/index.html
+++ b/webclient/index.html
@@ -58,7 +58,8 @@
                         <span ng-show="currentCall.state == 'invite_sent'">Calling...</span>
                         <span ng-show="currentCall.state == 'connecting'">Call Connecting...</span>
                         <span ng-show="currentCall.state == 'connected'">Call Connected</span>
-                        <span ng-show="currentCall.state == 'ended' && !currentCall.didConnect && currentCall.direction == 'outbound'">Call Rejected</span>
+                        <span ng-show="currentCall.state == 'ended' && !currentCall.didConnect && currentCall.direction == 'outbound' && currentCall.hangupParty == 'remote'">Call Rejected</span>
+                        <span ng-show="currentCall.state == 'ended' && !currentCall.didConnect && currentCall.direction == 'outbound' && currentCall.hangupParty == 'local'">Call Canceled</span>
                         <span ng-show="currentCall.state == 'ended' && currentCall.didConnect && currentCall.direction == 'outbound'">Call Ended</span>
                         <span ng-show="currentCall.state == 'ended' && !currentCall.didConnect && currentCall.direction == 'inbound'">Call Canceled</span>
                         <span ng-show="currentCall.state == 'ended' && currentCall.didConnect && currentCall.direction == 'inbound'">Call Ended</span>