diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2017-10-31 17:58:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-31 17:58:28 -0400 |
| commit | c7c0d34e920dea27cab3b88c50b1202343a54435 (patch) | |
| tree | 6966addb32a19e5c9606d0cbded7f922fb372461 /backend/x11 | |
| parent | 7200d643363e988edf6777c38e7f8fcd451a2c50 (diff) | |
| parent | ec22fe713445977c1a122572107495b584117b16 (diff) | |
Merge pull request #352 from emersion/output-cursor
Add wlr_output_cursor
Diffstat (limited to 'backend/x11')
| -rw-r--r-- | backend/x11/backend.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/backend/x11/backend.c b/backend/x11/backend.c index 37bbdaec..97b0dd8c 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -298,6 +298,9 @@ static void wlr_x11_backend_destroy(struct wlr_backend *backend) { struct wlr_x11_backend *x11 = (struct wlr_x11_backend *)backend; + struct wlr_x11_output *output = &x11->output; + wlr_output_destroy(&output->wlr_output); + wl_event_source_remove(x11->frame_timer); wlr_egl_free(&x11->egl); @@ -331,7 +334,7 @@ static void output_destroy(struct wlr_output *wlr_output) { eglDestroySurface(x11->egl.display, output->surf); xcb_destroy_window(x11->xcb_conn, output->win); - free(wlr_output); + // output has been allocated on the stack, do not free it } static void output_make_current(struct wlr_output *wlr_output) { |