From c071056913b3904e2a7330e3f6b38157119355df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking@gmail.com>
Date: Thu, 8 Sep 2011 22:19:41 +0200
Subject: [PATCH] fix yet another fun-with-pointers tabbing segfault

BUG: 281596
(cherry picked from commit f3ca7234ef4329b45bcd369aa49a70972a754302)
---
 manage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manage.cpp b/manage.cpp
index 222f64d3d3..1f410721aa 100644
--- a/manage.cpp
+++ b/manage.cpp
@@ -320,7 +320,7 @@ bool Client::manage(Window w, bool isMapped)
     if (!noBorder()) {
         client_group = NULL;
         // Automatically add to previous groups on session restore
-        if (session && session->clientGroupClient && session->clientGroupClient != this)
+        if (session && session->clientGroupClient && session->clientGroupClient != this && session->clientGroupClient->clientGroup())
             session->clientGroupClient->clientGroup()->add(this, -1, true);
         else if (isMapped)
             // If the window is already mapped (Restarted KWin) add any windows that already have the