Commit 6a02c254 authored by Laurent Montel's avatar Laurent Montel 😁

Don't modify expiry collection when we are not allowed

parent 9f5804fd
Pipeline #36483 failed with stage
in 6 minutes and 40 seconds
......@@ -63,7 +63,7 @@ find_package(KF5Prison ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5Holidays ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5GuiAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
set(MAILCOMMON_LIB_VERSION "5.15.47")
set(MAILCOMMON_LIB_VERSION "5.15.48")
set(GRAVATAR_LIB_VERSION "5.15.40")
set(PIMCOMMON_LIB_VERSION "5.15.40")
set(GRANTLEETHEME_LIB_VERSION "5.15.40")
......
......@@ -24,8 +24,10 @@ FolderConfigureSettingsExperyWidget::~FolderConfigureSettingsExperyWidget()
void FolderConfigureSettingsExperyWidget::save(Akonadi::Collection &col)
{
const MailCommon::CollectionExpirySettings settings = mCollectionExpiryWidget->settings();
if (wasModified()) {
mCollectionExpiryWidget->save(settings, col, true, false);
if (MailCommon::CollectionExpiryWidget::canHandle(col)) {
const MailCommon::CollectionExpirySettings settings = mCollectionExpiryWidget->settings();
if (wasModified()) {
mCollectionExpiryWidget->save(settings, col, true, 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