From 1ec9fc73342c79016c121046f705654f9e6bc460 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Thu, 12 May 2016 09:31:52 +0300
Subject: [PATCH] closes #4626

---
 public/src/app.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/src/app.js b/public/src/app.js
index a4acd0468b..2f61be6994 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -133,13 +133,16 @@ app.cacheBuster = null;
 	app.enterRoom = function (room, callback) {
 		callback = callback || function() {};
 		if (socket && app.user.uid && app.currentRoom !== room) {
+			var previousRoom = app.currentRoom;
+			app.currentRoom = room;
 			socket.emit('meta.rooms.enter', {
 				enter: room
 			}, function(err) {
 				if (err) {
+					app.currentRoom = previousRoom;
 					return app.alertError(err.message);
 				}
-				app.currentRoom = room;
+
 				callback();
 			});
 		}