From 52e52c7e904c451a05da3c37f0882dcfcfa9a4fe Mon Sep 17 00:00:00 2001 From: Bhushan Shah Date: Thu, 25 Aug 2016 13:52:28 +0530 Subject: [PATCH] activeWindow can be null this is possible in case kwin switches around to another active window --- containments/taskpanel/taskpanel.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/containments/taskpanel/taskpanel.cpp b/containments/taskpanel/taskpanel.cpp index 9b2b0bfc..b75467b9 100644 --- a/containments/taskpanel/taskpanel.cpp +++ b/containments/taskpanel/taskpanel.cpp @@ -141,9 +141,11 @@ void TaskPanel::updateActiveWindow() } m_activeWindow = m_windowManagement->activeWindow(); - connect(m_activeWindow.data(), &KWayland::Client::PlasmaWindow::closeableChanged, this, &TaskPanel::hasCloseableActiveWindowChanged); - connect(m_activeWindow.data(), &KWayland::Client::PlasmaWindow::unmapped, - this, &TaskPanel::forgetActiveWindow); + if (m_activeWindow) { + connect(m_activeWindow.data(), &KWayland::Client::PlasmaWindow::closeableChanged, this, &TaskPanel::hasCloseableActiveWindowChanged); + connect(m_activeWindow.data(), &KWayland::Client::PlasmaWindow::unmapped, + this, &TaskPanel::forgetActiveWindow); + } // TODO: connect to closeableChanged, not needed right now as KWin doesn't provide this changeable emit hasCloseableActiveWindowChanged();