--- mqtt/src/daemon.c	2012/06/01 10:39:48	1.2.2.35
+++ mqtt/src/daemon.c	2012/06/20 09:23:28	1.2.2.37
@@ -261,7 +261,8 @@ startSession(sched_task_t *task)
 		TAILQ_FOREACH(s, &Sessions, sess_node)
 			if (!strcmp(s->sess_cid, sess->sess_cid)) {
 				/* found stale session & disconnect it! */
-				schedWrite(root, leaveClient, sess, TASK_FD(task), NULL, 0);
+				schedCancelby(root, taskMAX, CRITERIA_FD, (void*) s->sess_sock, NULL);
+				schedWrite(root, leaveClient, s, s->sess_sock, NULL, 0);
 				break;
 			}
 	}
@@ -283,7 +284,7 @@ startSession(sched_task_t *task)
 		if (call.WipePUB_topic)
 			call.WipePUB_topic(&cfg, pub, sess->sess_cid, sess->sess_user, -1);
 	} else {
-		// todo: read_sql subs and prepare publish
+		// TODO: read_sql subs and prepare publish
 	}
 
 	/* Start session task OK ... */