libweston: don't clean up surface role
authorJames Hilliard <james.hilliard1@gmail.com>
Wed, 10 Jun 2020 20:40:04 +0000 (14:40 -0600)
committerPekka Paalanen <pq@iki.fi>
Fri, 12 Jun 2020 09:23:11 +0000 (09:23 +0000)
Surface roles are permanent, so it should not be cleaned up.

Fixes: #409
weston: ../libweston/compositor.c:4094: weston_surface_set_role: Assertion `role_name' failed.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
libweston/touch-calibration.c

index 3c76036..9dd99bb 100644 (file)
@@ -360,8 +360,6 @@ destroy_touch_calibrator(struct wl_resource *resource)
 
        if (calibrator->surface) {
                unmap_calibrator(calibrator);
-               weston_surface_set_role(calibrator->surface, NULL,
-                                       calibrator->surface->resource, 0);
                wl_list_remove(&calibrator->surface_destroy_listener.link);
                wl_list_remove(&calibrator->surface_commit_listener.link);
        }