From 9cdddb77228a1c2337afcbe4759cc508e157602a Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Tue, 22 Jan 2019 10:47:26 +0100 Subject: [PATCH] Fixed some log messages / missing asserts. --- client/Wayland/wlf_cliprdr.c | 3 --- uwac/libuwac/uwac-clipboard.c | 7 ++++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/client/Wayland/wlf_cliprdr.c b/client/Wayland/wlf_cliprdr.c index 9187bdd9e..f5e8f4b6f 100644 --- a/client/Wayland/wlf_cliprdr.c +++ b/client/Wayland/wlf_cliprdr.c @@ -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: diff --git a/uwac/libuwac/uwac-clipboard.c b/uwac/libuwac/uwac-clipboard.c index 6ae892e94..69920134a 100644 --- a/uwac/libuwac/uwac-clipboard.c +++ b/uwac/libuwac/uwac-clipboard.c @@ -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; }