[PATCH weston] desktop-shell: Don't assume there is a pointer when resizing

[Kristian Høgsberg]

On Mon, Jun 23, 2014 at 4:18 AM, Emilio Pozuelo Monfort
<pochu27 at gmail.com> wrote:
> Hi Kristian,
>
> On 19/06/14 07:37, Kristian Høgsberg wrote:
>> On Wed, Jun 18, 2014 at 05:48:58PM +0200, Emilio Pozuelo Monfort wrote:
>>> From: Emilio Pozuelo Monfort <emilio.pozuelo at collabora.co.uk>
>>>
>>> Fixes a crash on touch devices without a pointer, when touching
>>> the window frame of a client.
>>
>> Thanks, applied.  At some point we'll get rid of all these pointer
>> assumptions.
>
> I don't see this in master or 1.5. Maybe you forgot to push or something?

I did... should be out there now.

Kristian

> Regards,
> Emilio
>
>> Kristian
>>
>>> Signed-off-by: Emilio Pozuelo Monfort <emilio.pozuelo at collabora.co.uk>
>>> ---
>>>  desktop-shell/shell.c | 3 ++-
>>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
>>> index 84f5c83..d965618 100644
>>> --- a/desktop-shell/shell.c
>>> +++ b/desktop-shell/shell.c
>>> @@ -1784,7 +1784,8 @@ common_surface_resize(struct wl_resource *resource,
>>>      struct shell_surface *shsurf = wl_resource_get_user_data(resource);
>>>      struct weston_surface *surface;
>>>
>>> -    if (seat->pointer->button_count == 0 ||
>>> +    if (seat->pointer == NULL ||
>>> +        seat->pointer->button_count == 0 ||
>>>          seat->pointer->grab_serial != serial ||
>>>          seat->pointer->focus == NULL)
>>>              return;
>>> --
>>> 2.0.0
>>>
>>> _______________________________________________
>>> wayland-devel mailing list
>>> wayland-devel at lists.freedesktop.org
>>> http://lists.freedesktop.org/mailman/listinfo/wayland-devel
>>
>