From 0956f37bb218b97ff09bfa4d41c764d66ebd1917 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 24 Jul 2023 16:22:32 +0300 Subject: =?UTF-8?q?fixes=20#3583=20(Jabber:=20=D0=B8=D0=BD=D0=B4=D0=B8?= =?UTF-8?q?=D0=BA=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B2=D1=85=D0=BE=D0=B4=D1=8F?= =?UTF-8?q?=D1=88=D0=B5=D0=B3=D0=BE=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=BE=D1=82=D0=BA=D1=80=D1=8B=D1=82=D0=BE?= =?UTF-8?q?=D0=BC=20=D0=BE=D0=BA=D0=BD=D0=B5=20=D1=81=D0=BE=D0=BE=D0=B1?= =?UTF-8?q?=D1=89=D0=B5=D0=BD=D0=B8=D0=B9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mir_app/src/file.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/mir_app/src/file.cpp b/src/mir_app/src/file.cpp index 480066e887..97a6507a96 100644 --- a/src/mir_app/src/file.cpp +++ b/src/mir_app/src/file.cpp @@ -264,15 +264,24 @@ MEVENT Proto_RecvFile(MCONTACT hContact, PROTORECVFILE *pre) if (!bSilent && File::bAutoAccept && Contact::OnList(hContact)) LaunchRecvDialog(&cle); else { - Skin_PlaySound("RecvFile"); - // load offline files always (if OfflineSize = 0) // or if they are less than a limit (if a transfer has specified file size) if (bSilent && File::bOfflineAuto) if (File::iOfflineSize == 0 || (blob.getSize() > 0 && blob.getSize() < File::iOfflineSize * 1024)) Srmm_DownloadOfflineFile(hdbe, false); - if (!Contact::IsGroupChat(hContact)) { + bool bShow = !Contact::IsGroupChat(hContact); + if (bShow && blob.isOffline()) { + auto *pDlg = Srmm_FindDialog(hContact); + if (!pDlg && db_mc_isSub(hContact)) + pDlg = Srmm_FindDialog(db_mc_getMeta(hContact)); + if (pDlg) + bShow = false; + } + + if (bShow) { + Skin_PlaySound("RecvFile"); + wchar_t szTooltip[256]; mir_snwprintf(szTooltip, TranslateT("File from %s"), Clist_GetContactDisplayName(hContact)); -- cgit v1.2.3