From 1b3984c3cca457061f3049065c1f2fac055501d4 Mon Sep 17 00:00:00 2001 From: Scott Moreau Date: Mon, 21 May 2012 15:49:13 -0600 Subject: [PATCH] xwayland/window-manager.c: Use container_of to get the wm pointer since window may be NULL. --- src/xwayland/window-manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xwayland/window-manager.c b/src/xwayland/window-manager.c index 182c836..1f6035a 100644 --- a/src/xwayland/window-manager.c +++ b/src/xwayland/window-manager.c @@ -445,7 +445,7 @@ weston_wm_window_activate(struct wl_listener *listener, void *data) { struct weston_surface *surface = data; struct weston_wm_window *window = get_wm_window(surface); - struct weston_wm *wm = window->wm; + struct weston_wm *wm = container_of(listener, struct weston_wm, activate_listener); if (window) weston_wm_activate(wm, window, XCB_TIME_CURRENT_TIME); -- 2.7.4