From df525d6d5bf90578b754be6f891234dbe7a452a2 Mon Sep 17 00:00:00 2001
From: Marcelo Schmidt <marcelo.schmidt@gmail.com>
Date: Wed, 25 Nov 2015 17:10:58 -0200
Subject: [PATCH] Fix Rocket.Chat.Cordova issue #15.

---
 packages/rocketchat-lib/client/lib/openRoom.coffee |  1 +
 packages/rocketchat-ui/views/app/room.html         | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/rocketchat-lib/client/lib/openRoom.coffee b/packages/rocketchat-lib/client/lib/openRoom.coffee
index 545dce131b85..4a45b3a480e6 100644
--- a/packages/rocketchat-lib/client/lib/openRoom.coffee
+++ b/packages/rocketchat-lib/client/lib/openRoom.coffee
@@ -36,6 +36,7 @@ currentTracker = undefined
 				if roomDom.classList.contains('room-container')
 					roomDom.querySelector('.messages-box > .wrapper').scrollTop = roomDom.oldScrollTop
 
+			RocketChat.TabBar.setTemplate ''
 			Session.set 'openedRoom', room._id
 
 			Session.set 'editRoomTitle', false
diff --git a/packages/rocketchat-ui/views/app/room.html b/packages/rocketchat-ui/views/app/room.html
index 919ef914666a..c85eea27f69a 100644
--- a/packages/rocketchat-ui/views/app/room.html
+++ b/packages/rocketchat-ui/views/app/room.html
@@ -81,8 +81,10 @@ <h2>
 				{{> messageBox}}
 			</footer>
 		</section>
-		<section class="flex-tab">
-			{{> Template.dynamic template=flexTemplate data=flexData}}
-		</section>
+		{{#if flexTemplate}}
+			<section class="flex-tab">
+				{{> Template.dynamic template=flexTemplate data=flexData}}
+			</section>
+		{{/if}}
 	</div>
-</template>
\ No newline at end of file
+</template>