Merge remote-tracking branch 'origin/release/21.08'

5 years ago · c8d5a1d681
parent 283f87991b f5cc7697eb
commit c8d5a1d681
1 changed files with 3 additions and 2 deletions
--- a/src/folder/folderselectiondialog.cpp
+++ b/src/folder/folderselectiondialog.cpp
@ -180,9 +180,10 @@ void FolderSelectionDialog::slotAddChildFolder()
 {
    Akonadi::Collection parentCol;
    if (canCreateCollection(parentCol)) {
-        const QString name = QInputDialog::getText(this, i18nc("@title:window", "New Folder"), i18nc("@label:textbox, name of a thing", "Name"));
+        bool ok = false;
+        const QString name = QInputDialog::getText(this, i18nc("@title:window", "New Folder"), i18nc("@label:textbox, name of a thing", "Name"), {}, {}, &ok);

-        if (name.isEmpty()) {
+        if (name.isEmpty() || !ok) {
            return;
        }