From 0d22d25b8740688a4f243c70cdfd32bc05993778 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Thu, 1 Mar 2012 22:46:07 -0500 Subject: [PATCH] wayland-server: Destroy resource before sending out delete_id event In some cases, we send out events from the resource destructor and those need to go out before we recycle the object ID. --- src/wayland-server.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/wayland-server.c b/src/wayland-server.c index c70e411..6a8cbcb 100644 --- a/src/wayland-server.c +++ b/src/wayland-server.c @@ -393,19 +393,20 @@ WL_EXPORT void wl_resource_destroy(struct wl_resource *resource, uint32_t time) { struct wl_client *client = resource->client; + uint32_t id; + + id = resource->object.id; + destroy_resource(resource, &time); - if (resource->object.id < WL_SERVER_ID_START) { + if (id < WL_SERVER_ID_START) { if (client->display_resource) { wl_resource_queue_event(client->display_resource, - WL_DISPLAY_DELETE_ID, - resource->object.id); + WL_DISPLAY_DELETE_ID, id); } - wl_map_insert_at(&client->objects, resource->object.id, NULL); + wl_map_insert_at(&client->objects, id, NULL); } else { - wl_map_remove(&client->objects, resource->object.id); + wl_map_remove(&client->objects, id); } - - destroy_resource(resource, &time); } WL_EXPORT void -- 2.7.4