diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-09-01 15:51:44 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-09-01 15:51:44 +0100 |
| commit | f5755bcadfe6d27f1449f85f8b846ca4b02e5f20 (patch) | |
| tree | bfb9f36038c0728de5411059f3af97a4be473509 /webclient/room/room.html | |
| parent | Fix homeserver config parsing (diff) | |
| parent | Rename API-visible 'mtime' presence field to 'last_active'; slightly differen... (diff) | |
| download | synapse-f5755bcadfe6d27f1449f85f8b846ca4b02e5f20.tar.xz | |
Merge branch 'develop' into server2server_tls
Diffstat (limited to 'webclient/room/room.html')
| -rw-r--r-- | webclient/room/room.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webclient/room/room.html b/webclient/room/room.html index e5e454864b..d5b0f0ab96 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -106,7 +106,7 @@ <button ng-click="answerCall()">Answer</button> <button ng-click="hangupCall()">Reject</button> </div> - <button ng-click="hangupCall()" ng-show="currentCall && currentCall.state != 'ringing'">Hang up</button> + <button ng-click="hangupCall()" ng-show="currentCall && currentCall.state != 'ringing' && currentCall.state != 'ended' && currentCall.state != 'fledgling'">Hang up</button> <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> |