From 7d754f71d41c169e02a343d25b2f2c1234966471 Mon Sep 17 00:00:00 2001
From: Martin Duquesnoy <xorg62@gmail.com>
Date: Fri, 3 Jun 2011 18:10:25 +0200
Subject: [PATCH] Split: Add test of sc & tile flag at integration

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

diff --git a/src/split.c b/src/split.c
index a1c51e1..3727f09 100644
--- a/src/split.c
+++ b/src/split.c
@@ -284,7 +284,9 @@ split_client_integrate(Client *c, Client *sc, int screen, int tag)
                || !(tags[screen][tag].flags & SplitFlag))
           return;
 
-     if(!sc || sc == c || sc->screen != screen || sc->tag != tag)
+     /* Can't integrate in sc */
+     if(!sc || sc == c || !(sc->flags & TileFlag)
+               || sc->screen != screen || sc->tag != tag)
      {
           /* Looking for first client on wanted tag */
           for(b = False, sc = clients; sc; sc = sc->next)