From 286eb23094e65c80209cca5a029557e792010ec9 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 21 Nov 2018 20:36:44 +0300
Subject: fix for users sorting in group chats

---
 src/mir_app/src/chat_manager.cpp | 1 +
 src/mir_app/src/chat_svc.cpp     | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mir_app')

diff --git a/src/mir_app/src/chat_manager.cpp b/src/mir_app/src/chat_manager.cpp
index 1f2053110b..3552cf8e7d 100644
--- a/src/mir_app/src/chat_manager.cpp
+++ b/src/mir_app/src/chat_manager.cpp
@@ -696,6 +696,7 @@ USERINFO* UM_AddUser(STATUSINFO *pStatusList, SESSION_INFO *si, const wchar_t *p
 
 	USERINFO *node = new USERINFO();
 	replaceStrW(node->pszUID, pszUID);
+	replaceStrW(node->pszNick, pszNick);
 	node->Status = wStatus;
 	si->getUserList().insert(node);
 	return node;
diff --git a/src/mir_app/src/chat_svc.cpp b/src/mir_app/src/chat_svc.cpp
index fea2b786e5..2eeb134218 100644
--- a/src/mir_app/src/chat_svc.cpp
+++ b/src/mir_app/src/chat_svc.cpp
@@ -376,7 +376,6 @@ static void AddUser(GCEVENT *gce)
 	if (g_chatApi.OnAddUser)
 		g_chatApi.OnAddUser(si, ui);
 
-	ui->pszNick = mir_wstrdup(gce->ptszNick);
 	if (gce->bIsMe)
 		si->pMe = ui;
 	ui->Status = status;
-- 
cgit v1.2.3