xwayland/window-manager.c: Use container_of to get the wm pointer since window may be NULL.

13 years ago · 1b3984c3cc
parent 02709afb51
commit 1b3984c3cc
1 changed files with 1 additions and 1 deletions
--- 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);