From 9b1306c2120c5812bf7f4913bb3f42db926bb69f Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Tue, 16 Jan 2007 00:09:31 +0000 Subject: Sanity check for startup timer existense in service_filter --- hcid/dbus-service.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hcid/dbus-service.c b/hcid/dbus-service.c index 7c2a98a2..5ccad203 100644 --- a/hcid/dbus-service.c +++ b/hcid/dbus-service.c @@ -362,8 +362,11 @@ static DBusHandlerResult service_filter(DBusConnection *conn, service->action = NULL; } - g_timeout_remove(service->startup_timer); - service->startup_timer = 0; + if (service->startup_timer) { + g_timeout_remove(service->startup_timer); + service->startup_timer = 0; + } else + debug("service_filter: timeout was already removed!"); name_listener_add(conn, new, (name_cb_t) service_exit, service); -- cgit