summaryrefslogtreecommitdiff
path: root/src/compositor.c
diff options
context:
space:
mode:
authorEgor Starkov <egor.starkov@ge.com>2015-09-23 18:29:46 +0300
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>2015-09-24 13:26:23 +0300
commit56fe1c7edda1715beac2dd138685a7d5e96d7e41 (patch)
treef2a7fb4e10356fbadeba8b541b7f37f7b0b69119 /src/compositor.c
parent44bbdd08af3e01ad0841b8cf2deba436e6aec680 (diff)
downloadweston-56fe1c7edda1715beac2dd138685a7d5e96d7e41.tar.gz
compositor: remove incorrect idle timer initialization
weston_compositor_create() should just create idle timer but not arm it, because idle-time setting is not ready at this point. Remove idle timer first update in weston_compositor_create() since idle_time variable is not set at this point. Idle timer is armed properly later in weston_compositor_wake(). Signed-off-by: Egor Starkov <egor.starkov@ge.com> [Pekka: tweaked commit message] Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Diffstat (limited to 'src/compositor.c')
-rw-r--r--src/compositor.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/compositor.c b/src/compositor.c
index cbef4dc8..125afd52 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -4527,7 +4527,6 @@ weston_compositor_create(struct wl_display *display, void *user_data)
loop = wl_display_get_event_loop(ec->wl_display);
ec->idle_source = wl_event_loop_add_timer(loop, idle_handler, ec);
- wl_event_source_timer_update(ec->idle_source, ec->idle_time * 1000);
ec->input_loop = wl_event_loop_create();