Merge pull request #11989 from PhMemmel/fix-private-public-chat-lock

Fix private public chat lock interference

bigbluebutton-html5/imports/ui/components/chat/container.jsx

@@ -229,8 +229,6 @@ const ChatContainer = (props) => {
 
 export default lockContextContainer(injectIntl(withTracker(({ intl, userLocks }) => {
   const chatID = Session.get('idChatOpen');
-  const isChatLocked = userLocks.userPrivateChat || userLocks.userPublicChat;
-
   if (!chatID) {
     // No chatID is set so the panel is closed, about to close, or wasn't opened correctly
     return {
@@ -238,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 {