blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm: do not unset make/model before emitting destroy event

This commit is contained in:
Ilia Bozhinov 2020-12-06 21:27:45 +01:00 committed by Simon Ser
parent 37cb3eb8dd
commit 54b7ca56c0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/drm/drm.c
View File

@ -1615,10 +1615,6 @@ static void drm_connector_cleanup(struct wlr_drm_connector *conn) {
conn->output.enabled = false; conn->output.enabled = false;
conn->output.width = conn->output.height = conn->output.refresh = 0; conn->output.width = conn->output.height = conn->output.refresh = 0;
memset(&conn->output.make, 0, sizeof(conn->output.make));
memset(&conn->output.model, 0, sizeof(conn->output.model));
memset(&conn->output.serial, 0, sizeof(conn->output.serial));
if (conn->output.idle_frame != NULL) { if (conn->output.idle_frame != NULL) {
wl_event_source_remove(conn->output.idle_frame); wl_event_source_remove(conn->output.idle_frame);
conn->output.idle_frame = NULL; conn->output.idle_frame = NULL;
@ -1635,6 +1631,10 @@ static void drm_connector_cleanup(struct wlr_drm_connector *conn) {
conn->desired_mode = NULL; conn->desired_mode = NULL;
conn->pageflip_pending = false; conn->pageflip_pending = false;
wlr_signal_emit_safe(&conn->output.events.destroy, &conn->output); wlr_signal_emit_safe(&conn->output.events.destroy, &conn->output);
memset(&conn->output.make, 0, sizeof(conn->output.make));
memset(&conn->output.model, 0, sizeof(conn->output.model));
memset(&conn->output.serial, 0, sizeof(conn->output.serial));
break; break;
case WLR_DRM_CONN_DISCONNECTED: case WLR_DRM_CONN_DISCONNECTED:
break; break;