diff options
| author | George Hazan <ghazan@miranda.im> | 2023-03-25 15:11:34 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2023-03-25 15:11:34 +0300 |
| commit | 496b8d54f05de925f7827785544acbaec35fa356 (patch) | |
| tree | efddde401d7b52ed2ee54737a700045730e1a71e /src | |
| parent | 27d82200ded3da7e718bfef2cd50ab7ef18050dc (diff) | |
fixes #3454 (Telegram: crash fix)
Diffstat (limited to 'src')
| -rw-r--r-- | src/mir_app/src/chat_tools.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/mir_app/src/chat_tools.cpp b/src/mir_app/src/chat_tools.cpp index ee13b56e43..a263cbc35f 100644 --- a/src/mir_app/src/chat_tools.cpp +++ b/src/mir_app/src/chat_tools.cpp @@ -860,24 +860,23 @@ void Chat_Serialize(SESSION_INFO *si) JSONNode pRoleList(JSON_ARRAY); pRoleList.set_name("roles");
for (auto *p = si->pStatuses; p; p = p->next) {
JSONNode role;
- role << JSONNode("id", p->iStatus) << JSONNode("name", T2Utf(p->pszGroup).get());
+ role << JSONNode("id", p->iStatus) << JSONNode("name", p->pszGroup);
pRoleList << role;
}
JSONNode pUserList(JSON_ARRAY); pUserList.set_name("users");
for (auto &it : si->arUsers) {
JSONNode user;
- user << JSONNode("id", T2Utf(it->pszUID).get()) << JSONNode("nick", T2Utf(it->pszNick).get())
- << JSONNode("role", it->Status) << JSONNode("isMe", it == si->pMe);
+ user << JSONNode("id", it->pszUID) << JSONNode("nick", it->pszNick) << JSONNode("role", it->Status) << JSONNode("isMe", it == si->pMe);
pUserList << user;
}
JSONNode root;
root << pRoleList << pUserList;
if (si->ptszName)
- root << JSONNode("name", T2Utf(si->ptszName).get());
+ root << JSONNode("name", si->ptszName);
if (si->ptszTopic)
- root << JSONNode("topic", T2Utf(si->ptszTopic).get());
+ root << JSONNode("topic", si->ptszTopic);
ptrW wszText(json_write(&root));
if (wszText) {
|