Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into vector

src/CallHandler.js

@@ -175,6 +175,10 @@ dis.register(function(payload) {
             }
             calls[payload.room_id].answer();
             _setCallState(calls[payload.room_id], payload.room_id, "connected");
+            dis.dispatch({
+                action: "view_room",
+                room_id: payload.room_id
+            });
             break;
     }
 });

src/controllers/molecules/MessageComposer.js

@@ -30,7 +30,6 @@ var KeyCode = {
 
 module.exports = {
     componentWillMount: function() {
-        this.dispatcherRef = dis.register(this.onAction);
         this.tabStruct = {
             completing: false,
             original: null,
@@ -126,6 +125,7 @@ module.exports = {
     },
 
     componentDidMount: function() {
+        this.dispatcherRef = dis.register(this.onAction);
         this.sentHistory.init(
             this.refs.textarea.getDOMNode(),
             this.props.room.roomId

src/controllers/molecules/voip/CallView.js

@@ -30,9 +30,9 @@ module.exports = {
 
     componentDidMount: function() {
         this.dispatcherRef = dis.register(this.onAction);
-        this.setState({
+        if (this.props.room) {
-            call: null
+            this.showCall(this.props.room.roomId);
-        });
+        }
     },
 
     componentWillUnmount: function() {
@@ -48,8 +48,12 @@ module.exports = {
         if (payload.action !== 'call_state') {
             return;
         }
-        var call = CallHandler.getCall(payload.room_id);
+        this.showCall(payload.room_id);
-        if (call && call.type === "video") {
+    },
+
+    showCall: function(roomId) {
+        var call = CallHandler.getCall(roomId);
+        if (call && call.type === "video" && call.state !== 'ended') {
             this.getVideoView().getLocalVideoElement().style.display = "initial";
             this.getVideoView().getRemoteVideoElement().style.display = "initial";
             call.setLocalVideoElement(this.getVideoView().getLocalVideoElement());