summaryrefslogtreecommitdiff
path: root/protocols/Discord
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/Discord')
-rw-r--r--protocols/Discord/src/utils.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/protocols/Discord/src/utils.cpp b/protocols/Discord/src/utils.cpp
index 42fd0bd4d9..f35c81cfaa 100644
--- a/protocols/Discord/src/utils.cpp
+++ b/protocols/Discord/src/utils.cpp
@@ -224,8 +224,12 @@ void CDiscordProto::PreparePrivateChannel(const JSONNode &root)
Chat_Event(&gce);
}
- CMStringW wszId(FORMAT, L"%lld", getId(DB_KEY_ID));
- CMStringW wszNick(FORMAT, L"%s#%d", getMStringW(DB_KEY_NICK).c_str(), getDword(DB_KEY_DISCR));
+ CMStringW wszId(FORMAT, L"%lld", getId(DB_KEY_ID)), wszNick;
+ if (auto iDiscr = getDword(DB_KEY_DISCR))
+ wszNick.Format(L"%s#%d", getMStringW(DB_KEY_NICK).c_str(), iDiscr);
+ else
+ wszNick = getMStringW(DB_KEY_NICK);
+
gce.bIsMe = true;
gce.pszUID.w = wszId;
gce.pszNick.w = wszNick;