From 74a6e604aab10fd4047d36ac30810f4c197a31d6 Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@longsleep.org>
Date: Sun, 4 Jan 2015 13:44:39 +0100
Subject: [PATCH] Make sure to apply room changes.

---
 static/js/directives/roombar.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/static/js/directives/roombar.js b/static/js/directives/roombar.js
index 09855ea1..0573e23e 100644
--- a/static/js/directives/roombar.js
+++ b/static/js/directives/roombar.js
@@ -23,7 +23,7 @@
 define(['underscore', 'angular', 'text!partials/roombar.html'], function(_, angular, template) {
 
 	// roomBar
-	return ["$window", "rooms", "$timeout", function($window, rooms, $timeout) {
+	return ["$window", "rooms", "$timeout", "safeApply", function($window, rooms, $timeout, safeApply) {
 
 		var link = function($scope, $element) {
 
@@ -51,13 +51,17 @@ define(['underscore', 'angular', 'text!partials/roombar.html'], function(_, angu
 			};
 
 			$scope.$on("room.updated", function(ev, room) {
-				$scope.currentRoomName = $scope.newRoomName = room.Name;
-				if ($scope.currentRoomName && !$scope.peer) {
-					$scope.layout.roombar = true;
-				}
+				safeApply($scope, function(scope) {
+					scope.currentRoomName = scope.newRoomName = room.Name;
+					if (scope.currentRoomName && !scope.peer) {
+						scope.layout.roombar = true;
+					}
+				});
 			});
 
-			$scope.$on("room.left", clearRoomName);
+			$scope.$on("room.left", function() {
+				safeApply($scope, clearRoomName);
+			});
 
 			$scope.$watch("newRoomName", function(name) {
 				if (name === $scope.currentRoomName) {