diff options
| author | Drew DeVault <sir@cmpwn.com> | 2019-02-18 15:24:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-18 15:24:04 -0500 |
| commit | 7aa445779cb5c877216aac362af1b61a836e3467 (patch) | |
| tree | 58efbd489f40afc96a20576c0574acee1b14bbef | |
| parent | 93c8b91b05c44a0d477e323b6dc0a6a6219209c8 (diff) | |
| parent | 81ed1efe4f715d884c26c22f76e6a92f75893783 (diff) | |
Merge pull request #1556 from emersion/unmap
xwayland, data-device: fix surface state on unmap
| -rw-r--r-- | types/data_device/wlr_drag.c | 2 | ||||
| -rw-r--r-- | xwayland/xwm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/types/data_device/wlr_drag.c b/types/data_device/wlr_drag.c index 558e9f22..fdfabdcf 100644 --- a/types/data_device/wlr_drag.c +++ b/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; } } diff --git a/xwayland/xwm.c b/xwayland/xwm.c index 9ca2c721..fc99490b 100644 --- a/xwayland/xwm.c +++ b/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); } |