mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

client: wayland: Move RDPEI assertion past RDPEI availability check

Browse Source 
The wlf_handle_touch_down() implements fallback to mouse event submission
in case RDPEI is not available. This fallback is currently never reached,
because the WINPR_ASSERT(rdpei); triggers before the fallback conditional
is reached.

Move the WINPR_ASSERT(rdpei); after the RDPEI availability check to permit
the fallback to do its job.

Signed-off-by: Marek Vasut <marex@denx.de>
This commit is contained in:
Marek Vasut 2021-11-17 14:53:50 +01:00 committed by akallabeth
parent ed73cf0d17
commit 487894b5bb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/Wayland/wlf_input.c
View File

@ -473,7 +473,6 @@ BOOL wlf_handle_touch_down(freerdp* instance, const UwacTouchDown* ev)
return FALSE; return FALSE;
RdpeiClientContext* rdpei = wlf->rdpei; RdpeiClientContext* rdpei = wlf->rdpei;
WINPR_ASSERT(rdpei);
// Emulate mouse click if touch is not possible, like in login screen // Emulate mouse click if touch is not possible, like in login screen
if (!rdpei) if (!rdpei)
@ -492,6 +491,8 @@ BOOL wlf_handle_touch_down(freerdp* instance, const UwacTouchDown* ev)
return FALSE; return FALSE;
} }
WINPR_ASSERT(rdpei);
WINPR_ASSERT(rdpei->TouchBegin); WINPR_ASSERT(rdpei->TouchBegin);
rdpei->TouchBegin(rdpei, touchId, x, y, &contactId); rdpei->TouchBegin(rdpei, touchId, x, y, &contactId);