From edd5a29b10866c5ed1aaeb59ea7af260ef3043e4 Mon Sep 17 00:00:00 2001
From: Zlatin Balevsky <zlatinb@gmail.com>
Date: Wed, 13 Nov 2019 14:09:09 +0000
Subject: [PATCH] make private chat room ids unique across servers

---
 .../controllers/com/muwire/gui/ChatRoomController.groovy     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gui/griffon-app/controllers/com/muwire/gui/ChatRoomController.groovy b/gui/griffon-app/controllers/com/muwire/gui/ChatRoomController.groovy
index 5b15f925..ce86a795 100644
--- a/gui/griffon-app/controllers/com/muwire/gui/ChatRoomController.groovy
+++ b/gui/griffon-app/controllers/com/muwire/gui/ChatRoomController.groovy
@@ -101,7 +101,8 @@ class ChatRoomController {
         Persona p = view.getSelectedPersona()
         if (p == null)
             return
-        if (p != model.core.me && !mvcGroup.parentGroup.childrenGroups.containsKey(p.getHumanReadableName()+"-private-chat")) {
+        String groupId = model.host.getHumanReadableName() + "-" + p.getHumanReadableName() +"-private-chat"
+        if (p != model.core.me && !mvcGroup.parentGroup.childrenGroups.containsKey(groupId) {
             def params = [:]
             params['core'] = model.core
             params['tabName'] = model.tabName
@@ -110,7 +111,7 @@ class ChatRoomController {
             params['host'] = model.host
             params['roomTabName'] = p.getHumanReadableName()
             
-            mvcGroup.parentGroup.createMVCGroup("chat-room", p.getHumanReadableName()+"-private-chat", params)
+            mvcGroup.parentGroup.createMVCGroup("chat-room", groupId, params)
         }
     }