From d156103d8d718b1e48e3d6fb4b62d9aa94f48f1b Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 24 Feb 2015 14:53:11 +0100 Subject: [PATCH] Editor manager: Fix selected filter in Save as... Make sure to ask mime database only for mime type of non-empty paths. Change-Id: I5de896021c8438f17b1c5368674493337ccee0c4 Reviewed-by: Friedemann Kleint Reviewed-by: Eike Ziller --- src/plugins/coreplugin/editormanager/editormanager.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index fd27a5f253d..83fc2583a8b 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -1696,8 +1696,12 @@ bool EditorManagerPrivate::saveDocumentAs(IDocument *document) Utils::MimeDatabase mdb; const QString filter = Utils::MimeDatabase::allFiltersString(); - QString selectedFilter = - mdb.mimeTypeForFile(document->filePath().toFileInfo()).filterString(); + QString selectedFilter; + QString filePath = document->filePath().toString(); + if (filePath.isEmpty()) + filePath = document->defaultPath() + QLatin1Char('/') + document->suggestedFileName(); + if (!filePath.isEmpty()) + selectedFilter = mdb.mimeTypeForFile(filePath).filterString(); if (selectedFilter.isEmpty()) selectedFilter = mdb.mimeTypeForName(document->mimeType()).filterString(); const QString &absoluteFilePath =