From 23f1b04a71afddb0adc4cb5e9f8f496df1a814d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Thu, 17 Sep 2015 16:15:26 +0200 Subject: [PATCH] Fix regression in Workspace::activateNextClient This fixes yet another regression from the transient refactoring. The passed in client might be null, so we need a nullptr check. There are several already in that code. Was tricky given that I removed a cast there. --- activation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activation.cpp b/activation.cpp index 8a8a0ab135..f5df424904 100644 --- a/activation.cpp +++ b/activation.cpp @@ -483,7 +483,7 @@ bool Workspace::activateNextClient(AbstractClient* c) if (!get_focus) { // no suitable window under the mouse -> find sth. else // first try to pass the focus to the (former) active clients leader - if (c->isTransient()) { + if (c && c->isTransient()) { auto leaders = c->mainClients(); if (leaders.count() == 1 && FocusChain::self()->isUsableFocusCandidate(leaders.at(0), c)) { get_focus = leaders.at(0);