From 67a4cd898e114f5ca1e2c11a2ed5f4f38215e467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Fri, 4 May 2018 21:50:10 +0200 Subject: [PATCH] wayland/xdg-foreign: Send immediate destroy event to correct resource The destroyed signal that was emitted if an imported surface was not available when created, for example if the handle was invalid or already unexported, was emitted on the wrong resource. (cherry picked from commit 98d702428857c79770b159137835622e33b84ba9) --- src/wayland/meta-wayland-xdg-foreign.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wayland/meta-wayland-xdg-foreign.c b/src/wayland/meta-wayland-xdg-foreign.c index a04b2bfa7..cecef50a9 100644 --- a/src/wayland/meta-wayland-xdg-foreign.c +++ b/src/wayland/meta-wayland-xdg-foreign.c @@ -384,7 +384,7 @@ xdg_importer_import (struct wl_client *client, (!META_IS_WAYLAND_XDG_SURFACE (exported->surface->role) && !META_IS_WAYLAND_ZXDG_SURFACE_V6 (exported->surface->role))) { - zxdg_imported_v1_send_destroyed (resource); + zxdg_imported_v1_send_destroyed (xdg_imported_resource); return; }