[PATCH weston] compositor-wayland: Only destroy the egl_window when using GLES.

Quentin Glidic sardemff7+wayland at sardemff7.net
Fri Sep 2 20:17:10 UTC 2016


On 02/09/2016 22:10, Derek Foreman wrote:
> On 01/09/16 09:19 AM, Emmanuel Gil Peyrot wrote:
>> This prevents a segfault when unplugging an output when using pixman.
>>
>> Signed-off-by: Emmanuel Gil Peyrot <emmanuel.peyrot at collabora.com>
>
> Reviewed-by: Derek Foreman <derekf at osg.samsung.com>

Really obvious segfault fix ;-)
Pushed:
1714f01..85571a3  master -> master

Cheers,

>> ---
>>  libweston/compositor-wayland.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/libweston/compositor-wayland.c b/libweston/compositor-wayland.c
>> index 7c12b4c..c223baa 100644
>> --- a/libweston/compositor-wayland.c
>> +++ b/libweston/compositor-wayland.c
>> @@ -627,9 +627,9 @@ wayland_output_destroy(struct weston_output *output_base)
>>  		pixman_renderer_output_destroy(output_base);
>>  	} else {
>>  		gl_renderer->output_destroy(output_base);
>> +		wl_egl_window_destroy(output->gl.egl_window);
>>  	}
>>
>> -	wl_egl_window_destroy(output->gl.egl_window);
>>  	wl_surface_destroy(output->parent.surface);
>>  	if (output->parent.shell_surface)
>>  		wl_shell_surface_destroy(output->parent.shell_surface);
>>


-- 

Quentin “Sardem FF7” Glidic


More information about the wayland-devel mailing list