summaryrefslogtreecommitdiff
path: root/src/compositor.c
diff options
context:
space:
mode:
authorJonas Ådahl <jadahl@gmail.com>2012-03-28 22:36:09 +0200
committerKristian Høgsberg <krh@bitplanet.net>2012-03-28 23:00:08 -0400
commitc97af923d937aba4cec923169969b65b2d2710f4 (patch)
tree16fac9dd892f910b13c493ab9d5b4b660635a9ab /src/compositor.c
parentb5ef591faca088e041e5b174145f8a3c2888e5ff (diff)
Properly dispose event sources and event loops
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Diffstat (limited to 'src/compositor.c')
-rw-r--r--src/compositor.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/compositor.c b/src/compositor.c
index 47305cc..f9e1f23 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -2415,6 +2415,8 @@ weston_compositor_shutdown(struct weston_compositor *ec)
struct weston_output *output, *next;
wl_event_source_remove(ec->idle_source);
+ if (ec->input_loop_source)
+ wl_event_source_remove(ec->input_loop_source);
if (ec->screenshooter)
screenshooter_destroy(ec->screenshooter);
@@ -2427,6 +2429,8 @@ weston_compositor_shutdown(struct weston_compositor *ec)
wl_array_release(&ec->vertices);
wl_array_release(&ec->indices);
+
+ wl_event_loop_destroy(ec->input_loop);
}
static int on_term_signal(int signal_number, void *data)