diff --git a/src/gui/tray/activitylistmodel.cpp b/src/gui/tray/activitylistmodel.cpp index 4068813dd6..76fb6f8dbe 100644 --- a/src/gui/tray/activitylistmodel.cpp +++ b/src/gui/tray/activitylistmodel.cpp @@ -904,16 +904,16 @@ QVariant ActivityListModel::convertLinkToActionButton(const OCC::ActivityLink &a QVariantList ActivityListModel::convertLinksToMenuEntries(const Activity &activity) { + if (static_cast(activity._links.size()) <= maxActionButtons()) { + return {}; + } + QVariantList customList; - if (static_cast(activity._links.size()) > maxActionButtons()) { - for (int i = 0; i < activity._links.size(); ++i) { - const auto &activityLink = activity._links[i]; - if (!activityLink._primary) { - customList << QVariantMap{ - {QStringLiteral("actionIndex"), i}, {QStringLiteral("label"), activityLink._label}}; - } - } + for (int i = maxActionButtons(); i < activity._links.size(); ++i) { + const auto activityLinkLabel = activity._links[i]._label; + const auto menuEntry = QVariantMap{{"actionIndex", i}, {"label", activityLinkLabel}}; + customList << menuEntry; } return customList;