Commit 4ca26462 authored by Laurent Montel's avatar Laurent Montel 😁

Minor fix

parent d94fe80c
...@@ -1529,7 +1529,7 @@ void KMMainWidget::slotRemoveFolder() ...@@ -1529,7 +1529,7 @@ void KMMainWidget::slotRemoveFolder()
if (!mCurrentFolderSettings) { if (!mCurrentFolderSettings) {
return; return;
} }
if (!mCurrentCollection.isValid()) { if (!mCurrentFolderSettings->isValid()) {
return; return;
} }
if (mCurrentFolderSettings->isSystemFolder()) { if (mCurrentFolderSettings->isSystemFolder()) {
...@@ -3823,7 +3823,7 @@ void KMMainWidget::updateMessageActionsDelayed() ...@@ -3823,7 +3823,7 @@ void KMMainWidget::updateMessageActionsDelayed()
actionList << messageActions()->editAction(); actionList << messageActions()->editAction();
} }
actionList << mSaveAttachmentsAction; actionList << mSaveAttachmentsAction;
if (mCurrentFolderSettings && FolderArchive::FolderArchiveUtil::resourceSupportArchiving(mCurrentCollection.resource())) { if (mCurrentCollection.isValid() && FolderArchive::FolderArchiveUtil::resourceSupportArchiving(mCurrentCollection.resource())) {
actionList << mArchiveAction; actionList << mArchiveAction;
} }
mGUIClient->unplugActionList(QStringLiteral("messagelist_actionlist")); mGUIClient->unplugActionList(QStringLiteral("messagelist_actionlist"));
......
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