Merge pull request #1556 from emersion/unmap

xwayland, data-device: fix surface state on unmap

types/data_device/wlr_drag.c

@@ -96,8 +96,8 @@ static void drag_icon_set_mapped(struct wlr_drag_icon *icon, bool mapped) {
 		icon->mapped = true;
 		wlr_signal_emit_safe(&icon->events.map, icon);
 	} else if (!mapped && icon->mapped) {
-		icon->mapped = false;
 		wlr_signal_emit_safe(&icon->events.unmap, icon);
+		icon->mapped = false;
 	}
 }
 

xwayland/xwm.c

@@ -793,8 +793,8 @@ static void xwm_map_shell_surface(struct wlr_xwm *xwm,
 
 static void xsurface_unmap(struct wlr_xwayland_surface *surface) {
 	if (surface->mapped) {
-		surface->mapped = false;
 		wlr_signal_emit_safe(&surface->events.unmap, surface);
+		surface->mapped = false;
 		xwm_set_net_client_list(surface->xwm);
 	}