[PATCH] shell: Fix crash when an input panel is hiding

Kristian Høgsberg hoegsberg at gmail.com
Tue Sep 25 07:58:10 PDT 2012


On Wed, Sep 19, 2012 at 02:31:57PM +0200, Jan Arne Petersen wrote:
> From: Jan Arne Petersen <jpetersen at openismus.com>
> 
> Do not call weston_slide_run when the surface's output is NULL.
> ---
>  src/shell.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/src/shell.c b/src/shell.c
> index 2afa1b3..8dc6f50 100644
> --- a/src/shell.c
> +++ b/src/shell.c
> @@ -2765,7 +2765,8 @@ show_input_panels(struct wl_listener *listener, void *data)
>  			       &ws->layer_link);
>  		weston_surface_update_transform(ws);
>  		weston_surface_damage(ws);
> -		weston_slide_run(ws, ws->geometry.height, 0, NULL, NULL);
> +		if (ws->output)
> +			weston_slide_run(ws, ws->geometry.height, 0, NULL, NULL);

We should always have an output at this point, since
weston_surface_update_transform() sets that based on the surface
position.  But since the slide starts off-screen, maybe it fails to
find an output, not sure... we'd have to try to figure out why it's
NULL.

Kristian

>  	}
>  }
>  
> -- 
> 1.7.11.4
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel


More information about the wayland-devel mailing list