mirror of
https://gitlab.freedesktop.org/wlroots/wlroots.git
synced 2026-06-14 14:32:57 -04:00
Merge branch '260427' into 'master'
backend/session: fix wlr_device remove See merge request wlroots/wlroots!5359
This commit is contained in:
commit
f6d3ab26ad
3 changed files with 18 additions and 11 deletions
|
|
@ -65,7 +65,9 @@ static void backend_destroy(struct wlr_backend *backend) {
|
|||
}
|
||||
|
||||
free(drm->name);
|
||||
wlr_session_close_file(drm->session, drm->dev);
|
||||
if (drm->dev) {
|
||||
wlr_session_close_file(drm->session, drm->dev);
|
||||
}
|
||||
wl_event_source_remove(drm->drm_event);
|
||||
free(drm);
|
||||
}
|
||||
|
|
@ -152,6 +154,7 @@ static void handle_dev_remove(struct wl_listener *listener, void *data) {
|
|||
struct wlr_drm_backend *drm = wl_container_of(listener, drm, dev_remove);
|
||||
|
||||
wlr_log(WLR_INFO, "Destroying DRM backend for %s", drm->name);
|
||||
drm->dev = NULL;
|
||||
backend_destroy(&drm->backend);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue