summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerry Boland <gerry.boland@canonical.com>2015-08-20 13:38:34 +0100
committerPaul Olav Tvete <paul.tvete@theqtcompany.com>2015-08-26 11:44:46 +0000
commit44b35337d359a5bef30af2f64e1b88a4925048e1 (patch)
tree96ba5aca0792a6db08742339d71a50ccbbcbad1d
parenta5fbe0230be919b9e8365dee41c29112bb67a144 (diff)
Check if session is there, may not if process OOM killed
Change-Id: I98ea274d34650b33519f18e31010ecd57c8e9836 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
-rw-r--r--src/modules/Unity/Application/mirsurfaceitem.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/Unity/Application/mirsurfaceitem.cpp b/src/modules/Unity/Application/mirsurfaceitem.cpp
index a671c1d..2e061b3 100644
--- a/src/modules/Unity/Application/mirsurfaceitem.cpp
+++ b/src/modules/Unity/Application/mirsurfaceitem.cpp
@@ -726,7 +726,7 @@ void MirSurfaceItem::updateMirSurfaceFocus(bool focused)
qCDebug(QTMIR_SURFACES) << "MirSurfaceItem::updateMirSurfaceFocus" << focused;
// Temporary hotfix for http://pad.lv/1483752
- if (session()->childSessions()->rowCount() > 0) {
+ if (session() && session()->childSessions()->rowCount() > 0) {
// has child trusted session, ignore any focus change attempts
return;
}