40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
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 02/11] 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 93a218addeb965ca421ac593f1ab5373bc344431..8b873aa8a382399b8bfc7ae7c6ff0ba65041d37e 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;
|
|
}
|
|
|
|
--
|
|
2.6.6
|
|
|