input-panel: Fix show_input_panel_surface crash when no surface has focus

Signed-off-by: Nicolas Guyomard <nicolas.guyomard@open.eurogiciel.org>
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>

diff --git a/desktop-shell/input-panel.c b/desktop-shell/input-panel.c
index 251d0449a6c4f55d4c031054ec7119e20f45d4a1..95d6287382795817c0ade7c0b6f098a117aedb8a 100644 (file)
--- a/desktop-shell/input-panel.c
+++ b/desktop-shell/input-panel.c
@@ -74,6 +74,8 @@ show_input_panel_surface(struct input_panel_surface *ipsurf)
                if (!keyboard || !keyboard->focus)
                        continue;
                focus = weston_surface_get_main_surface(keyboard->focus);
+               if (!focus)
+                       continue;
                ipsurf->output = focus->output;
                x = ipsurf->output->x + (ipsurf->output->width - ipsurf->surface->width) / 2;
                y = ipsurf->output->y + ipsurf->output->height - ipsurf->surface->height;