From a6c235e062a6cbf9907c99df3c41ac2f39cb2acc Mon Sep 17 00:00:00 2001
From: Martin Duquesnoy <xorg62@gmail.com>
Date: Thu, 2 Feb 2012 13:35:41 +0100
Subject: [PATCH] Circular tag_next in tag_del

---
 src/tag.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/tag.c b/src/tag.c
index 8dbeb78..129ee1f 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -256,8 +256,11 @@ uicb_tag_del(Uicb cmd)
      if(SLIST_EMPTY(&t->clients)
         && TAILQ_NEXT(TAILQ_FIRST(&W->screen->tags), next))
      {
+          struct tag *n = (TAILQ_NEXT(t, next)
+                           ? TAILQ_NEXT(t, next)
+                           : TAILQ_FIRST(&W->screen->tags));
 
-          tag_screen(W->screen, TAILQ_NEXT(t, next));
+          tag_screen(W->screen, n);
           tag_remove(t);
 
           W->screen->flags |= SCREEN_TAG_UPDATE;