From da41b5739df1a9768a97c77d80a8d9c513a2bd6f Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Fri, 10 Jul 2015 18:13:48 -0700 Subject: xwayland: Allow dump_property when selection fails dump_property allows reply to be NULL. Calling it unconditionally will ensure user knows where the selection failed. Also refactor code a bit. Suggested by Marek Chalupa --- xwayland/selection.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'xwayland') diff --git a/xwayland/selection.c b/xwayland/selection.c index 2f60c0ec..452cd69d 100644 --- a/xwayland/selection.c +++ b/xwayland/selection.c @@ -240,14 +240,14 @@ weston_wm_get_selection_data(struct weston_wm *wm) 0x1fffffff /* length */); reply = xcb_get_property_reply(wm->conn, cookie, NULL); - if (reply == NULL) - return; - if (reply->type == wm->atom.incr) { - dump_property(wm, wm->atom.wl_selection, reply); + dump_property(wm, wm->atom.wl_selection, reply); + + if (reply == NULL) { + return; + } else if (reply->type == wm->atom.incr) { wm->incr = 1; } else { - dump_property(wm, wm->atom.wl_selection, reply); wm->incr = 0; weston_wm_write_property(wm, reply); } -- cgit v1.2.1