diff --git a/shell/scripting/scriptengine.cpp b/shell/scripting/scriptengine.cpp index bd21a2bbc..bef0c04dd 100644 --- a/shell/scripting/scriptengine.cpp +++ b/shell/scripting/scriptengine.cpp @@ -177,34 +177,17 @@ QScriptValue ScriptEngine::createActivity(QScriptContext *context, QScriptEngine KActivities::Controller controller; - QString id; - - QSet 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 futureId = controller.addActivity(name); - QEventLoop loop; + //TODO: if there are activities without containment, recycle + QFuture futureId = controller.addActivity(name); + QEventLoop loop; - QFutureWatcher *watcher = new QFutureWatcher(); - connect(watcher, &QFutureWatcherBase::finished, &loop, &QEventLoop::quit); + QFutureWatcher *watcher = new QFutureWatcher(); + 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);