diff --git a/src/searchdialog/searchwindow.cpp b/src/searchdialog/searchwindow.cpp --- a/src/searchdialog/searchwindow.cpp +++ b/src/searchdialog/searchwindow.cpp @@ -458,24 +458,16 @@ recursive = true; } } else if (mUi.mChkMultiFolders->isChecked()) { - if (!mSelectMultiCollectionDialog) { - if (mCollectionId.isEmpty()) { - mSearchPatternWidget->showWarningPattern(QStringList() << i18n("You forgot to select collections.")); - return; - } - } else { + if (mSelectMultiCollectionDialog) { mCollectionId = mSelectMultiCollectionDialog->selectedCollection(); } - searchCollections.reserve(mCollectionId.count()); - for (const Akonadi::Collection &col : qAsConst(mCollectionId)) { - searchCollections << col; - } - if (searchCollections.isEmpty()) { + if (mCollectionId.isEmpty()) { mUi.mSearchFolderEdt->setEnabled(true); mSearchPatternWidget->showWarningPattern(QStringList() << i18n("You forgot to select collections.")); mQuery = Akonadi::SearchQuery(); return; } + searchCollections << mCollectionId; } mUi.mPatternEdit->updateSearchPattern();