summaryrefslogtreecommitdiff
path: root/xwayland/window-manager.c
diff options
context:
space:
mode:
Diffstat (limited to 'xwayland/window-manager.c')
-rw-r--r--xwayland/window-manager.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/xwayland/window-manager.c b/xwayland/window-manager.c
index 5d3a2e5d..6cac2782 100644
--- a/xwayland/window-manager.c
+++ b/xwayland/window-manager.c
@@ -1403,6 +1403,12 @@ weston_wm_handle_client_message(struct weston_wm *wm,
client_message->data.data32[4],
client_message->window);
+ /* The window may get created and destroyed before we actually
+ * handle the message. If it doesn't exist, bail.
+ */
+ if (!window)
+ return;
+
if (client_message->type == wm->atom.net_wm_moveresize)
weston_wm_window_handle_moveresize(window, client_message);
else if (client_message->type == wm->atom.net_wm_state)