don't try to recycle activities

that was a bad idea.
the idea was "is there an activity that doesn't
have a containment"? use that
but if an activity oesn't have a containment something else
went already wrong
wilder-5.14
Marco Martin 10 years ago
parent 703648c036
commit f27dca81ba
  1. 33
      shell/scripting/scriptengine.cpp

@ -177,34 +177,17 @@ QScriptValue ScriptEngine::createActivity(QScriptContext *context, QScriptEngine
KActivities::Controller controller;
QString id;
QSet <QString> knownActivities;
foreach (Plasma::Containment *cont, env->m_corona->containments()) {
knownActivities.insert(cont->activity());
}
foreach (const QString &act, controller.activities()) {
if (!knownActivities.contains(act)) {
id = act;
}
}
if (id.isEmpty()) {
//TODO: if there are activities without containment, recycle
QFuture<QString> futureId = controller.addActivity(name);
QEventLoop loop;
//TODO: if there are activities without containment, recycle
QFuture<QString> futureId = controller.addActivity(name);
QEventLoop loop;
QFutureWatcher<QString> *watcher = new QFutureWatcher<QString>();
connect(watcher, &QFutureWatcherBase::finished, &loop, &QEventLoop::quit);
QFutureWatcher<QString> *watcher = new QFutureWatcher<QString>();
connect(watcher, &QFutureWatcherBase::finished, &loop, &QEventLoop::quit);
watcher->setFuture(futureId);
watcher->setFuture(futureId);
loop.exec();
id = futureId.result();
} else {
controller.setActivityName(id, name);
}
loop.exec();
QString id = futureId.result();
Activity *a = new Activity(id, env->m_corona);

Loading…
Cancel
Save