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
wilder-5.14
Marco Martin 10 years ago
parent 23f5907256
commit f7ef6ee87b
  1. 6
      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;
}

Loading…
Cancel
Save