diff options
| author | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-04-30 11:43:56 +0300 |
|---|---|---|
| committer | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-04-30 10:53:34 +0000 |
| commit | 22529efe1bd78b92813eddc0b62e1bede1695940 (patch) | |
| tree | 3a10d288aa2d1ae03d97b0cdbaccd49e526ad37c | |
| parent | 701db3c7f5c4c5288b10ec3f2edb3e761d1947dd (diff) | |
Fix variants import issue
Fix this issue: When opening the variants import dialog and selecting a
file but clicking cancel, the variants file is still imported.
Task-number: QT3DS-3371
Change-Id: Ia8687027943915fbb8120e3d321723cd80a9af8a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| -rw-r--r-- | src/Authoring/Studio/Workspace/Dialogs.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Authoring/Studio/Workspace/Dialogs.cpp b/src/Authoring/Studio/Workspace/Dialogs.cpp index 0a462ea2..b7119c55 100644 --- a/src/Authoring/Studio/Workspace/Dialogs.cpp +++ b/src/Authoring/Studio/Workspace/Dialogs.cpp @@ -1161,9 +1161,9 @@ QString CDialogs::getImportVariantsDlg() dlg.setDefaultSuffix(QStringLiteral(".variants")); dlg.setNameFilters({tr("All supported files (*.variants *.uia)"), tr("Variants files (*.variants)"), tr("Project files (*.uia)")}); - dlg.exec(); + auto result = dlg.exec(); - if (!dlg.selectedFiles().empty()) + if (result == QDialog::Accepted && !dlg.selectedFiles().empty()) return dlg.selectedFiles().front(); return {}; |