From 4c5a6f7a18d22703520ea5ece7f126d2629cc909 Mon Sep 17 00:00:00 2001 From: Andrew Engelbrecht Date: Tue, 2 Dec 2014 12:18:44 -0500 Subject: [PATCH] xwm: fix a crash in handle_state To produce the bug, build and run: (you don't need the game data to test) https://github.com/clintbellanger/flare-engine/ $ mv ~/.config/flare ~/.config/flare.bak $ ./flare # click 'configure', set full screen mode then click 'ok' # weston will crash and dump core. [Pekka: edited the commit message] Reviewed-by: Pekka Paalanen --- xwayland/window-manager.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xwayland/window-manager.c b/xwayland/window-manager.c index bdfac23e..9284a05c 100644 --- a/xwayland/window-manager.c +++ b/xwayland/window-manager.c @@ -1326,7 +1326,9 @@ weston_wm_window_handle_state(struct weston_wm_window *window, WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT, 0, NULL); } else { - shell_interface->set_toplevel(window->shsurf); + if (window->shsurf) + shell_interface->set_toplevel(window->shsurf); + window->width = window->saved_width; window->height = window->saved_height; if (window->frame)