summary refs log tree commit diff
path: root/webclient/components/matrix/matrix-phone-service.js
diff options
context:
space:
mode:
authorDavid Baker <dbkr@matrix.org>2014-09-16 15:25:51 +0100
committerDavid Baker <dbkr@matrix.org>2014-09-16 15:26:22 +0100
commit84372cef4a512ae4603767c97c8055c218ac1557 (patch)
tree6cb020a365073b61bff4dcd7f69599aed1eddf86 /webclient/components/matrix/matrix-phone-service.js
parentFixed scroll flickering when opening the room (diff)
downloadsynapse-84372cef4a512ae4603767c97c8055c218ac1557.tar.xz
Time out calls from both ends properly.
Diffstat (limited to '')
-rw-r--r--webclient/components/matrix/matrix-phone-service.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/webclient/components/matrix/matrix-phone-service.js b/webclient/components/matrix/matrix-phone-service.js

index 3e99a7d112..d05eecf72a 100644 --- a/webclient/components/matrix/matrix-phone-service.js +++ b/webclient/components/matrix/matrix-phone-service.js
@@ -60,7 +60,7 @@ angular.module('matrixPhoneService', []) var MatrixCall = $injector.get('MatrixCall'); var call = new MatrixCall(event.room_id); call.call_id = msg.call_id; - call.initWithInvite(msg); + call.initWithInvite(event); matrixPhoneService.allCalls[call.call_id] = call; // if we stashed candidate events for that call ID, play them back now @@ -132,7 +132,7 @@ angular.module('matrixPhoneService', []) var MatrixCall = $injector.get('MatrixCall'); var call = new MatrixCall(event.room_id); call.call_id = msg.call_id; - call.initWithHangup(msg); + call.initWithHangup(event); matrixPhoneService.allCalls[msg.call_id] = call; } else { call.onHangupReceived();