From 382690e5c8cae6a8ca58e45b0cfc7859d4ad7fbf Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 10 Sep 2018 17:43:19 +0200
Subject: [PATCH] Don't open other pads' chat in the current pad's messenger

---
 www/common/sframe-common.js  | 5 +++++
 www/contacts/messenger-ui.js | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js
index e3b9ab59d..756e9494e 100644
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -162,6 +162,10 @@ define([
     };
 
     // Chat
+    var padChatChannel;
+    funcs.getPadChat = function () {
+        return padChatChannel;
+    };
     funcs.openPadChat = function (saveChanges) {
         var md = JSON.parse(JSON.stringify(ctx.metadataMgr.getMetadata()));
         var channel = md.chat || Hash.createChannelId();
@@ -170,6 +174,7 @@ define([
             ctx.metadataMgr.updateMetadata(md);
             setTimeout(saveChanges);
         }
+        padChatChannel = channel;
         ctx.sframeChan.query('Q_CHAT_OPENPADCHAT', channel, function (err, obj) {
             if (err || (obj && obj.error)) { console.error(err || (obj && obj.error)); }
         });
diff --git a/www/contacts/messenger-ui.js b/www/contacts/messenger-ui.js
index d7eac3e3e..339ebae51 100644
--- a/www/contacts/messenger-ui.js
+++ b/www/contacts/messenger-ui.js
@@ -708,6 +708,8 @@ define([
         };
 
         var onPadChatReady = function (data) {
+            var padChat = common.getPadChat();
+            if (data !== padChat) { return; }
             execCommand('GET_ROOMS', {padChat: data}, function (err, rooms) {
                 if (err) { return void console.error(err); }
                 if (!Array.isArray(rooms) || rooms.length !== 1) {