diff options
| -rwxr-xr-x | protocols/JabberG/src/jabber_util.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msgdialog.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/protocols/JabberG/src/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp index e54b85b618..a1f80b2244 100755 --- a/protocols/JabberG/src/jabber_util.cpp +++ b/protocols/JabberG/src/jabber_util.cpp @@ -586,7 +586,7 @@ char* CJabberProto::GetClientJID(const char *jid, char *dest, size_t destLen) mir_cslock lck(m_csLists);
JABBER_LIST_ITEM *LI = ListGetItemPtr(LIST_ROSTER, jid);
if (LI != nullptr) {
- if (strchr(dest, '/')) {
+ if (strchr(dest, '/') == nullptr) {
pResourceStatus r(LI->getBestResource());
if (r != nullptr)
strncpy_s(dest, destLen, MakeJid(jid, r->m_szResourceName), _TRUNCATE);
diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp index 2897180152..2aea76600e 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -1473,7 +1473,7 @@ void CMsgDialog::NotifyTyping(int mode) void CMsgDialog::RemakeLog()
{
- m_pLog->LogEvents(m_hDbEventFirst, -1, 0);
+ m_pLog->LogEvents(m_hDbEventFirst, -1, false);
}
void CMsgDialog::ShowAvatar()
|