diff options
| author | George Hazan <ghazan@miranda.im> | 2020-02-17 18:00:46 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2020-02-17 18:00:54 +0300 |
| commit | 73769ed8b0004dd35a33fdf75d3186f557cb60f3 (patch) | |
| tree | 245743897e5d0301fcd4c2f0305c012d21efbdbb /protocols/JabberG/src/jabber_proto.cpp | |
| parent | 554555b0d5de320c02a272caeccf8a419c1f62a8 (diff) | |
code cleaning
Diffstat (limited to 'protocols/JabberG/src/jabber_proto.cpp')
| -rwxr-xr-x | protocols/JabberG/src/jabber_proto.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index bb71ff5212..75f1e735a1 100755 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -884,7 +884,7 @@ HANDLE CJabberProto::SendFile(MCONTACT hContact, const wchar_t *szDescription, w ft->szDescription = mir_wstrdup(szDescription);
ft->jid = mir_strdup(jid);
- if (m_bUseHttpUpload || (jcb & JABBER_CAPS_SI_FT))
+ if ((m_bInlinePictures && ProtoGetAvatarFileFormat(ft->std.szCurrentFile.w)) || m_bUseHttpUpload || (jcb & JABBER_CAPS_SI_FT))
FtInitiate(item->jid, ft);
else if (jcb & JABBER_CAPS_OOB)
ForkThread((MyThreadFunc)&CJabberProto::FileServerThread, ft);
|