Commit 05826bd5 authored by Eike Hein's avatar Eike Hein

Fix crash when switching activities.

Summary:
What happens:
* Activity switch calls invalidateFilter on TaskFilterProxyModel,
  which may remove rows in response.
* Up the proxy chain, TasksModel may ask LauncherTasksModel to
  emit dataChanged for its contents in response to the row removal,
  to cause its own filtering to re-evaluate the launchers for the
  life cycle logic.
* This can cause TFPM to do more filtering before invalidateFilter
  has actually returned, causing trip-ups such as duplicated rows
  in the proxy.
* Eventually the corrupted maps cause a memory corruption crash.

This patch changes step 2 to "find the launchers in the TFPM (the
direct source model) and ask for a dataChanged for each". This
costs us a loop and accesses to IsLauncher, but on the other hand
fixes the crash and avoids a lot of filtering and mapping work
between LTM and up to and including TFPM. It's also just better
code to ask for the dataChanged only from the model we need it
from.

BUG:376055

Reviewers: #plasma, davidedmundson

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D4631
parent 410086d0
......@@ -394,9 +394,13 @@ void TasksModel::Private::initModels()
Q_UNUSED(last)
if (launcherCheckNeeded) {
QMetaObject::invokeMethod(launcherTasksModel, "dataChanged",
Q_ARG(QModelIndex, launcherTasksModel->index(0, 0)),
Q_ARG(QModelIndex, launcherTasksModel->index(launcherTasksModel->rowCount() - 1, 0)));
for (int i = 0; i < filterProxyModel->rowCount(); ++i) {
const QModelIndex &idx = filterProxyModel->index(i, 0);
if (idx.data(AbstractTasksModel::IsLauncher).toBool()) {
filterProxyModel->dataChanged(idx, idx);
}
}
launcherCheckNeeded = false;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment