From 3f138dc40c37ddee021b92e5d29676ed96b6cab8 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sat, 15 Oct 2016 00:12:58 +0000
Subject: Rename a function for consistency and some spacing nits.

---
 session.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'session.c')

diff --git a/session.c b/session.c
index 634f89d9..423b7db1 100644
--- a/session.c
+++ b/session.c
@@ -211,6 +211,7 @@ session_destroy(struct session *s)
 	struct winlink	*wl;
 
 	log_debug("session %s destroyed", s->name);
+	s->curw = NULL;
 
 	RB_REMOVE(sessions, &sessions, s);
 	notify_session_closed(s);
@@ -385,14 +386,17 @@ int
 session_detach(struct session *s, struct winlink *wl)
 {
 	if (s->curw == wl &&
-	    session_last(s) != 0 && session_previous(s, 0) != 0)
+	    session_last(s) != 0 &&
+	    session_previous(s, 0) != 0)
 		session_next(s, 0);
 
 	wl->flags &= ~WINLINK_ALERTFLAGS;
 	notify_window_unlinked(s, wl->window);
 	winlink_stack_remove(&s->lastw, wl);
 	winlink_remove(&s->windows, wl);
+
 	session_group_synchronize_from(s);
+
 	if (RB_EMPTY(&s->windows)) {
 		session_destroy(s);
 		return (1);
-- 
cgit