From 69aaf0e701a5708771d41f4fadaf0468974b1c6d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 25 Feb 2023 17:08:29 +0300 Subject: better solution for #3344 --- src/core/stdfile/src/filerecvdlg.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/core/stdfile/src/filerecvdlg.cpp b/src/core/stdfile/src/filerecvdlg.cpp index 587120e360..540ac478ca 100644 --- a/src/core/stdfile/src/filerecvdlg.cpp +++ b/src/core/stdfile/src/filerecvdlg.cpp @@ -335,6 +335,9 @@ public: INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) override { + if (dat == nullptr) + return 0; + switch (msg) { case WM_COMMAND: if (Clist_MenuProcessCommand(LOWORD(wParam), MPCF_CONTACTMENU, dat->hContact)) @@ -343,7 +346,7 @@ public: case HM_RECVEVENT: ACKDATA *ack = (ACKDATA *)lParam; - if (!ack || !dat || (ack->hProcess != dat->fs) || (ack->type != ACKTYPE_FILE) || (ack->hContact != dat->hContact)) + if (!ack || (ack->hProcess != dat->fs) || (ack->type != ACKTYPE_FILE) || (ack->hContact != dat->hContact)) break; if (ack->result == ACKRESULT_DENIED || ack->result == ACKRESULT_FAILED) { -- cgit v1.2.3