From f8e1e51c21a11224a4def8689eb7bae95928a782 Mon Sep 17 00:00:00 2001
From: Blade Barringer <blade@crookedneighbor.com>
Date: Tue, 28 Jun 2016 08:13:09 -0500
Subject: [PATCH] fix(client): Prevent group from freezing up when sending a
 chat message

---
 website/client/js/controllers/chatCtrl.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/website/client/js/controllers/chatCtrl.js b/website/client/js/controllers/chatCtrl.js
index 0ce61b1e08..73aa1ab060 100644
--- a/website/client/js/controllers/chatCtrl.js
+++ b/website/client/js/controllers/chatCtrl.js
@@ -34,7 +34,11 @@ habitrpg.controller('ChatCtrl', ['$scope', 'Groups', 'Chat', 'User', '$http', 'A
         .then(function(response) {
           var message = response.data.data.message;
 
-          group.chat.unshift(message);
+          if (message) {
+            group.chat.unshift(message);
+          } else {
+            group.chat = response.data.data.chat;
+          }
 
           $scope.message.content = '';
           $scope._sending = false;