summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2007-01-16 00:09:31 +0000
committerJohan Hedberg <johan.hedberg@nokia.com>2007-01-16 00:09:31 +0000
commit9b1306c2120c5812bf7f4913bb3f42db926bb69f (patch)
treeab41aa3ccaa858502934b710447d2420b0fea5a7
parenta78dd5dfaa489d151864365781ea1f4e40c85cb2 (diff)
Sanity check for startup timer existense in service_filter
-rw-r--r--hcid/dbus-service.c7
1 files 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);