aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2019-01-31 20:33:48 +0100
committeremersion <contact@emersion.fr>2019-01-31 20:33:48 +0100
commitf1d3aeff9ac21af339bfff8966c07c79692eb643 (patch)
tree8bf39775171037a0c4979e6b08dbf6e97902ac84
parent41af8d845933f2bc6b158d0cac5a0c5688cce7d0 (diff)
data-device: fix crash when setting the same selection twice
-rw-r--r--types/data_device/wlr_data_device.c5
-rw-r--r--types/wlr_primary_selection.c6
2 files changed, 7 insertions, 4 deletions
diff --git a/types/data_device/wlr_data_device.c b/types/data_device/wlr_data_device.c
index ad5bed36..feddfa2d 100644
--- a/types/data_device/wlr_data_device.c
+++ b/types/data_device/wlr_data_device.c
@@ -167,6 +167,11 @@ static void seat_handle_selection_source_destroy(
void wlr_seat_set_selection(struct wlr_seat *seat,
struct wlr_data_source *source, uint32_t serial) {
+ if (seat->selection_source == source) {
+ seat->selection_serial = serial;
+ return;
+ }
+
if (seat->selection_source) {
wl_list_remove(&seat->selection_source_destroy.link);
wlr_data_source_destroy(seat->selection_source);
diff --git a/types/wlr_primary_selection.c b/types/wlr_primary_selection.c
index 9b33d362..05b74720 100644
--- a/types/wlr_primary_selection.c
+++ b/types/wlr_primary_selection.c
@@ -69,10 +69,8 @@ static void seat_handle_primary_selection_source_destroy(
void wlr_seat_set_primary_selection(struct wlr_seat *seat,
struct wlr_primary_selection_source *source, uint32_t serial) {
- if (seat->primary_selection_source != NULL &&
- seat->primary_selection_serial - serial < UINT32_MAX / 2) {
- wlr_log(WLR_DEBUG, "Rejecting set_selection request, invalid serial "
- "(%"PRIu32" <= %"PRIu32")", serial, seat->primary_selection_serial);
+ if (seat->primary_selection_source == source) {
+ seat->primary_selection_serial = serial;
return;
}