From f7ef6ee87b8957bebc976b6fc9e0df279cea05f1 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Wed, 20 Jul 2016 13:57:08 +0200
Subject: [PATCH] don't try to load layout before kamd starts

if the status of kamd is anything but running, refuse to
execute load()
this fixes activity creation in default layout initialization
---
 shell/shellcorona.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
index 93a218add..8b873aa8a 100644
--- a/shell/shellcorona.cpp
+++ b/shell/shellcorona.cpp
@@ -302,7 +302,9 @@ void ShellCorona::setShell(const QString &shell)
 
     connect(m_activityController, &KActivities::Controller::serviceStatusChanged, this, &ShellCorona::load, Qt::UniqueConnection);
 
-    load();
+    if (m_activityController->serviceStatus() == KActivities::Controller::Running) {
+        load();
+    }
 }
 
 QString ShellCorona::shell() const
@@ -330,7 +332,7 @@ static QList<QScreen*> sortOutputs(const QList<QScreen*> &outputs)
 void ShellCorona::load()
 {
     if (m_shell.isEmpty() ||
-        m_activityController->serviceStatus() == KActivities::Controller::Unknown) {
+        m_activityController->serviceStatus() != KActivities::Controller::Running) {
         return;
     }