session_last == -1 could still leave us with the window we are about to remove.

This commit is contained in:
Nicholas Marriott 2007-09-21 18:16:31 +00:00
parent 1702a781bb
commit d63977ea8a

View File

@ -1,4 +1,4 @@
/* $Id: session.c,v 1.9 2007-09-20 18:03:23 nicm Exp $ */
/* $Id: session.c,v 1.10 2007-09-21 18:16:31 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -129,11 +129,11 @@ session_attach(struct session *s, struct window *w)
int
session_detach(struct session *s, struct window *w)
{
if (s->window == w) {
if (session_last(s) == -1)
session_previous(s);
}
/* Move to last, previous of next window if possible. */
if (s->window == w && session_last(s) != 0 && session_previous(s) != 0)
session_next(s);
/* Remove the window from the list. */
window_remove(&s->windows, w);
/* Destroy session if it is empty. */