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

xwayland/selection: do not remove NULL property_source

Browse Source 
Happened mostly with neovim's xclip usage.

[daniels: Added more cases.]

Reviewed-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Greg V 2018-07-22 11:36:21 +01:00 committed by Daniel Stone
parent 67546bed04
commit 3ea5437dbd
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xwayland/selection.c
View File

@ -370,7 +370,8 @@ weston_wm_read_data_source(int fd, uint32_t mask, void *data)
if (len == -1) { if (len == -1) {
weston_log("read error from data source: %m\n"); weston_log("read error from data source: %m\n");
weston_wm_send_selection_notify(wm, XCB_ATOM_NONE); weston_wm_send_selection_notify(wm, XCB_ATOM_NONE);
wl_event_source_remove(wm->property_source); if (wm->property_source)
wl_event_source_remove(wm->property_source);
wm->property_source = NULL; wm->property_source = NULL;
close(fd); close(fd);
wl_array_release(&wm->source_data); wl_array_release(&wm->source_data);
@ -394,7 +395,8 @@ weston_wm_read_data_source(int fd, uint32_t mask, void *data)
1, &incr_chunk_size); 1, &incr_chunk_size);
wm->selection_property_set = 1; wm->selection_property_set = 1;
wm->flush_property_on_delete = 1; wm->flush_property_on_delete = 1;
wl_event_source_remove(wm->property_source); if (wm->property_source)
wl_event_source_remove(wm->property_source);
wm->property_source = NULL; wm->property_source = NULL;
weston_wm_send_selection_notify(wm, wm->selection_request.property); weston_wm_send_selection_notify(wm, wm->selection_request.property);
} else if (wm->selection_property_set) { } else if (wm->selection_property_set) {
@ -402,7 +404,8 @@ weston_wm_read_data_source(int fd, uint32_t mask, void *data)
"property delete\n", wm->source_data.size); "property delete\n", wm->source_data.size);
wm->flush_property_on_delete = 1; wm->flush_property_on_delete = 1;
wl_event_source_remove(wm->property_source); if (wm->property_source)
wl_event_source_remove(wm->property_source);
wm->property_source = NULL; wm->property_source = NULL;
} else { } else {
weston_log("got %zu bytes, " weston_log("got %zu bytes, "
@ -416,7 +419,8 @@ weston_wm_read_data_source(int fd, uint32_t mask, void *data)
weston_wm_flush_source_data(wm); weston_wm_flush_source_data(wm);
weston_wm_send_selection_notify(wm, wm->selection_request.property); weston_wm_send_selection_notify(wm, wm->selection_request.property);
xcb_flush(wm->conn); xcb_flush(wm->conn);
wl_event_source_remove(wm->property_source); if (wm->property_source)
wl_event_source_remove(wm->property_source);
wm->property_source = NULL; wm->property_source = NULL;
close(fd); close(fd);
wl_array_release(&wm->source_data); wl_array_release(&wm->source_data);
@ -435,7 +439,8 @@ weston_wm_read_data_source(int fd, uint32_t mask, void *data)
weston_wm_flush_source_data(wm); weston_wm_flush_source_data(wm);
} }
xcb_flush(wm->conn); xcb_flush(wm->conn);
wl_event_source_remove(wm->property_source); if (wm->property_source)
wl_event_source_remove(wm->property_source);
wm->property_source = NULL; wm->property_source = NULL;
close(wm->data_source_fd); close(wm->data_source_fd);
wm->data_source_fd = -1; wm->data_source_fd = -1;