From 319138eda4c803c1e33a41cc317566722ad5f9d5 Mon Sep 17 00:00:00 2001
From: Philipp Memmel <philipp.memmel@thg.muenchen.musin.de>
Date: Sun, 11 Apr 2021 21:48:25 +0200
Subject: [PATCH] avoid problems when chat doesn't have proper state
---
.../imports/ui/components/chat/container.jsx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/bigbluebutton-html5/imports/ui/components/chat/container.jsx b/bigbluebutton-html5/imports/ui/components/chat/container.jsx
index ad9f6559ed..89c41a9ff2 100755
--- a/bigbluebutton-html5/imports/ui/components/chat/container.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/container.jsx
@@ -229,9 +229,6 @@ const ChatContainer = (props) => {
export default lockContextContainer(injectIntl(withTracker(({ intl, userLocks }) => {
const chatID = Session.get('idChatOpen');
- const isChatLocked = (userLocks.userPrivateChat && chatID !== PUBLIC_CHAT_KEY)
- || (userLocks.userPublicChat && chatID === PUBLIC_CHAT_KEY);
-
if (!chatID) {
// No chatID is set so the panel is closed, about to close, or wasn't opened correctly
return {
@@ -239,6 +236,9 @@ export default lockContextContainer(injectIntl(withTracker(({ intl, userLocks })
};
}
+ const isChatLocked = (userLocks.userPrivateChat && chatID !== PUBLIC_CHAT_KEY)
+ || (userLocks.userPublicChat && chatID === PUBLIC_CHAT_KEY);
+
const { connected: isMeteorConnected } = Meteor.status();
return {
--
GitLab