summary refs log tree commit diff
path: root/webclient/room
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-21 17:55:41 +0100
committerErik Johnston <erik@matrix.org>2014-08-21 17:55:41 +0100
commit2e1ab9db08e3fe41822a65fdf38feafbd22173b6 (patch)
tree07d304a6cfd661c9c449e69da97101e47e3a8e55 /webclient/room
parentAdd ts field to all events. (diff)
downloadsynapse-2e1ab9db08e3fe41822a65fdf38feafbd22173b6.tar.xz
Only start event streaming after having set up the controllers.
Diffstat (limited to 'webclient/room')
-rw-r--r--webclient/room/room-controller.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index eee805dafb..214166a434 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -328,6 +328,7 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities'])
                             var chunk = response.data.chunk[i];
                             updateMemberList(chunk);
                         }
+                        eventStreamService.resume();
                     },
                     function(error) {
                         $scope.feedback = "Failed get member list: " + error.data.error;