blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #591 from emersion/fix-data-source-notify-finish 

Fix assertion failed in data_source_notify_finish
This commit is contained in:
Drew DeVault 2018-01-28 15:54:21 -05:00 committed by GitHub
parent f0b3a71fbc 5bbff20b8d
commit 60b2d969e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
types/wlr_data_device.c
View File

@ -173,16 +173,19 @@ static void data_offer_resource_destroy(struct wl_resource *resource) {
goto out;
}
offer->source->offer = NULL;
// If the drag destination has version < 3, wl_data_offer.finish
// won't be called, so do this here as a safety net, because
// we still want the version >= 3 drag source to be happy.
if (wl_resource_get_version(offer->resource) <
WL_DATA_OFFER_ACTION_SINCE_VERSION) {
data_source_notify_finish(offer->source);
offer->source->offer = NULL;
} else if (offer->source->dnd_finish) {
// source->cancel can free the source
offer->source->offer = NULL;
offer->source->cancel(offer->source);
} else {
offer->source->offer = NULL;
}
out: