Merge branch 'master' into paz-927

[pazpar2-moved-to-github.git] / src / session.c

diff --git a/src/session.c b/src/session.c
index b210f27..41447c6 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -570,7 +570,6 @@ static void select_targets_callback(struct session *se,
         l->next = se->clients_cached;
         se->clients_cached = l;
     }
-    /* set session always. If may be 0 if client is not active */
     client_set_session(cl, se);
 
     l = xmalloc(sizeof(*l));
@@ -619,6 +618,7 @@ static void session_remove_cached_clients(struct session *se)
         client_lock(l->client);
         client_set_session(l->client, 0);
         client_set_database(l->client, 0);
+        client_mark_dead(l->client);
         client_unlock(l->client);
         client_destroy(l->client);
         xfree(l);