From 0bf8e0cc807b4279f1c60ad21ceb2e7e96eb606a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking@gmail.com>
Date: Fri, 8 Jun 2012 20:39:27 +0200
Subject: [PATCH] check whether SessionInfo::tabGroupClient is (still) in
 workspace before using it

BUG: 301456
FIXED-IN: 4.9
REVIEW: 105186
---
 manage.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/manage.cpp b/manage.cpp
index 18713b6529..08a50a14eb 100644
--- a/manage.cpp
+++ b/manage.cpp
@@ -312,6 +312,8 @@ bool Client::manage(Window w, bool isMapped)
         const bool autogrouping = rules()->checkAutogrouping(options->isAutogroupSimilarWindows());
         const bool autogroupInFg = rules()->checkAutogroupInForeground(options->isAutogroupInForeground());
         // Automatically add to previous groups on session restore
+        if (session && session->tabGroupClient && !workspace()->hasClient(session->tabGroupClient))
+            session->tabGroupClient = NULL;
         if (session && session->tabGroupClient && session->tabGroupClient != this) {
             tabBehind(session->tabGroupClient, autogroupInFg);
         } else if (isMapped && autogrouping) {