From 6f142e9ac61783e79c27e56ed6aa2fc7ff13683d Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Tue, 4 Dec 2007 20:25:17 +0000 Subject: [PATCH] Don't try to access more windows if the session has been destroyed. --- server.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server.c b/server.c index 05a84c4a..6c974264 100644 --- a/server.c +++ b/server.c @@ -1,4 +1,4 @@ -/* $Id: server.c,v 1.42 2007-12-01 11:10:33 nicm Exp $ */ +/* $Id: server.c,v 1.43 2007-12-04 20:25:17 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -436,8 +436,8 @@ server_lost_window(struct window *w) if (!session_has(s, w)) continue; - /* Detach window and either redraw or kill clients. */ restart: + /* Detach window and either redraw or kill clients. */ RB_FOREACH(wl, winlinks, &s->windows) { if (wl->window != w) continue; @@ -453,6 +453,9 @@ server_lost_window(struct window *w) c->session = NULL; server_write_client(c, MSG_EXIT, NULL, 0); } + /* If the session was destroyed, bail now. */ + if (destroyed) + break; goto restart; } }