[PATCH weston 2/2] input-panel: Fix show_input_panel_surface crash when no surface has focus

[Bryce Harrington]

On Tue, Oct 06, 2015 at 10:40:28AM -0500, Derek Foreman wrote:
> From: Nicolas Guyomard <nicolas.guyomard at open.eurogiciel.org>
> 
> Signed-off-by: Nicolas Guyomard <nicolas.guyomard at open.eurogiciel.org>
> Signed-off-by: Derek Foreman <derekf at osg.samsung.desktop>

Thanks, R-b and pushed this one (but not #1 due to derek's NAK):

remote: Updating patchwork state for http://patchwork.freedesktop.org/project/wayland/list/
remote: I: patch #61150 updated using rev 4845354cfad33dbc6ef5c3bd3c1d3757a0522088
remote: I: 1 patch(es) updated to state Accepted.
To ssh://git.freedesktop.org/git/wayland/weston
   a151975..4845354  master -> master


> 
> diff --git a/desktop-shell/input-panel.c b/desktop-shell/input-panel.c
> index 251d044..95d6287 100644
> --- 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;
> -- 
> 2.5.3
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel