From 984085ac54f28070d80d2b1d4e618e5df39b4e9b Mon Sep 17 00:00:00 2001
From: yanas <yana@jitsi.org>
Date: Mon, 18 Sep 2017 15:37:58 -0500
Subject: [PATCH] fix(conference.js): Add message listeners only when chat is
 enabled

---
 conference.js | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/conference.js b/conference.js
index 4ae8e3fe9..26b257f0e 100644
--- a/conference.js
+++ b/conference.js
@@ -72,7 +72,10 @@ import {
     mediaPermissionPromptVisibilityChanged,
     suspendDetected
 } from './react/features/overlay';
-import { showDesktopSharingButton } from './react/features/toolbox';
+import {
+    isButtonEnabled,
+    showDesktopSharingButton
+} from './react/features/toolbox';
 
 const { participantConnectionStatus } = JitsiMeetJS.constants;
 
@@ -366,7 +369,8 @@ class ConferenceConnector {
         logger.error('CONFERENCE Error:', err, params);
         switch (err) {
         case ConferenceErrors.CHAT_ERROR:
-            {
+            logger.error("Chat error.", err);
+            if (isButtonEnabled('chat')) {
                 let [code, msg] = params;
                 APP.UI.showChatError(code, msg);
             }
@@ -1737,20 +1741,23 @@ export default {
             room.on(ConferenceEvents.CONNECTION_RESTORED, () => {
                 APP.UI.markVideoInterrupted(false);
             });
-            room.on(ConferenceEvents.MESSAGE_RECEIVED, (id, body, ts) => {
-                let nick = getDisplayName(id);
-                APP.API.notifyReceivedChatMessage({
-                    id,
-                    nick,
-                    body,
-                    ts
+
+            if (isButtonEnabled('chat')) {
+                room.on(ConferenceEvents.MESSAGE_RECEIVED, (id, body, ts) => {
+                    let nick = getDisplayName(id);
+                    APP.API.notifyReceivedChatMessage({
+                        id,
+                        nick,
+                        body,
+                        ts
+                    });
+                    APP.UI.addMessage(id, nick, body, ts);
                 });
-                APP.UI.addMessage(id, nick, body, ts);
-            });
-            APP.UI.addListener(UIEvents.MESSAGE_CREATED, (message) => {
-                APP.API.notifySendingChatMessage(message);
-                room.sendTextMessage(message);
-            });
+                APP.UI.addListener(UIEvents.MESSAGE_CREATED, (message) => {
+                    APP.API.notifySendingChatMessage(message);
+                    room.sendTextMessage(message);
+                });
+            }
 
             APP.UI.addListener(UIEvents.SELECTED_ENDPOINT, (id) => {
                 try {