From 58f6699f46e31048a0ec475a41d472b2120a78c7 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 26 Feb 2019 19:57:16 +0300
Subject: more fixes related to #1827 - now the core checks unique user ids
 itself

---
 include/m_chat_int.h | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'include')

diff --git a/include/m_chat_int.h b/include/m_chat_int.h
index fa292f4d13..586972536e 100644
--- a/include/m_chat_int.h
+++ b/include/m_chat_int.h
@@ -85,8 +85,8 @@ class CChatRoomDlg;
 
 struct USERINFO : public MZeroedObject, public MNonCopyable
 {
-	wchar_t* pszNick;
 	wchar_t* pszUID;
+	wchar_t* pszNick;
 	WORD     Status;
 	int      iStatusEx;
 	WORD     ContactStatus;
@@ -97,15 +97,15 @@ struct MIR_APP_EXPORT GCModuleInfoBase : public MZeroedObject, public MNonCopyab
 	GCModuleInfoBase();
 	~GCModuleInfoBase();
 
-	char     *pszModule;
-	wchar_t  *ptszModDispName;
-	char     *pszHeader;
+	char*    pszModule;
+	wchar_t* ptszModDispName;
+	char*    pszHeader;
 	
-	bool      bBold, bItalics, bUnderline;
-	bool      bColor, bBkgColor;
-	bool      bChanMgr, bAckMsg;
+	bool     bBold, bItalics, bUnderline;
+	bool     bColor, bBkgColor;
+	bool     bChanMgr, bAckMsg;
 	
-	int       iMaxText;
+	int      iMaxText;
 };
 
 struct COMMANDINFO
@@ -180,6 +180,7 @@ struct MIR_APP_EXPORT GCSessionInfoBase : public MZeroedObject, public MNonCopya
 	MODULEINFO *pMI;
 	GCSessionInfoBase *pParent;
 
+	LIST<USERINFO> arKeys;
 	OBJLIST<USERINFO> arUsers;
 
 	wchar_t pszLogFileName[MAX_PATH];
@@ -191,6 +192,10 @@ struct MIR_APP_EXPORT GCSessionInfoBase : public MZeroedObject, public MNonCopya
 	__forceinline OBJLIST<USERINFO>& getUserList()
 	{	return (pParent != nullptr) ? pParent->arUsers : arUsers;
 	}
+
+	__forceinline LIST<USERINFO>& getKeyList()
+	{	return (pParent != nullptr) ? pParent->arKeys : arKeys;
+	}
 };
 
 struct GCLogStreamDataBase
-- 
cgit v1.2.3