mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed some log messages / missing asserts.

This commit is contained in:
Armin Novak 2019-01-22 10:47:26 +01:00
parent 1cec0e0346
commit 9cdddb7722
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/Wayland/wlf_cliprdr.c
View File

@ -274,9 +274,6 @@ BOOL wlf_cliprdr_handle_event(wfClipboard* clipboard, const UwacClipboardEvent*
if (!clipboard || !event)
return FALSE;
if (!clipboard)
return FALSE;
switch (event->type)
{
case UWAC_EVENT_CLIPBOARD_AVAILABLE:

7
uwac/libuwac/uwac-clipboard.c
View File

@ -48,7 +48,7 @@ static void data_offer_offer(void* data, struct wl_data_offer* data_offer,
if (!event)
{
assert(uwacErrorHandler(seat->display, UWAC_ERROR_INTERNAL,
"failed to allocate a close event\n"));
"failed to allocate a clipboard event\n"));
}
else
{
@ -68,7 +68,8 @@ static void data_device_data_offer(void* data, struct wl_data_device* data_devic
{
UwacSeat* seat = (UwacSeat*)data;
if (seat && !seat->ignore_announcement)
assert(seat);
if (!seat->ignore_announcement)
{
UwacClipboardEvent* event = (UwacClipboardEvent*)UwacDisplayNewEvent(seat->display,
UWAC_EVENT_CLIPBOARD_SELECT);
@ -84,7 +85,7 @@ static void data_device_data_offer(void* data, struct wl_data_device* data_devic
wl_data_offer_add_listener(data_offer, &data_offer_listener, data);
seat->offer = data_offer;
}
else if (seat)
else
seat->offer = NULL;
}