diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2019-03-18 14:27:09 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2019-03-18 14:17:46 +0000 |
| commit | 7c31398c3ac9c3ccaf654a6e1e39e438df2e8807 (patch) | |
| tree | d028bc0fac3daeedfc1423341aae3d13e96aec6e | |
| parent | 838e3569632c5ab90d191abdf34ea9409961090b (diff) | |
Don't try to open duplicated .qml files as presentations in editor
Task-number: QT3DS-3172
Change-Id: Ic1e3f34cbf9c7ff6ffe241ad7f305e9c51c86b2b
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
| -rw-r--r-- | src/Authoring/Studio/Application/StudioApp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Authoring/Studio/Application/StudioApp.cpp b/src/Authoring/Studio/Application/StudioApp.cpp index 4ef8de39..c49aec65 100644 --- a/src/Authoring/Studio/Application/StudioApp.cpp +++ b/src/Authoring/Studio/Application/StudioApp.cpp @@ -2250,7 +2250,7 @@ void CStudioApp::duplicatePresentation(const QString &presFile) if (presFile.isEmpty()) thePresFile = GetCore()->GetDoc()->GetDocumentPath(); - if (PerformSavePrompt()) { + if (qmlStream || PerformSavePrompt()) { QFileInfo fi(thePresFile); QString relativePresPath = QDir(GetCore()->getProjectFile().getProjectPath()) .relativeFilePath(fi.absoluteFilePath()); @@ -2261,7 +2261,7 @@ void CStudioApp::duplicatePresentation(const QString &presFile) m_pMainWnd); dlg.exec(); const QString newPres = dlg.getDuplicateFile(); - if (!newPres.isEmpty()) + if (!qmlStream && !newPres.isEmpty()) OnLoadDocument(newPres); } } |