xwm: do not crash when activating a NULL surface
This commit is contained in:
committed by
Kristian Høgsberg
parent
b502f906db
commit
9f42e50868
@@ -610,11 +610,15 @@ static void
|
|||||||
weston_wm_window_activate(struct wl_listener *listener, void *data)
|
weston_wm_window_activate(struct wl_listener *listener, void *data)
|
||||||
{
|
{
|
||||||
struct weston_surface *surface = data;
|
struct weston_surface *surface = data;
|
||||||
struct weston_wm_window *window = get_wm_window(surface);
|
struct weston_wm_window *window = NULL;
|
||||||
struct weston_wm *wm =
|
struct weston_wm *wm =
|
||||||
container_of(listener, struct weston_wm, activate_listener);
|
container_of(listener, struct weston_wm, activate_listener);
|
||||||
xcb_client_message_event_t client_message;
|
xcb_client_message_event_t client_message;
|
||||||
|
|
||||||
|
if (surface) {
|
||||||
|
window = get_wm_window(surface);
|
||||||
|
}
|
||||||
|
|
||||||
if (window) {
|
if (window) {
|
||||||
client_message.response_type = XCB_CLIENT_MESSAGE;
|
client_message.response_type = XCB_CLIENT_MESSAGE;
|
||||||
client_message.format = 32;
|
client_message.format = 32;
|
||||||
|
|||||||
Reference in New Issue
Block a user