From 972a306d5604b56bbdd555d9e9d8dda33b72975c Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 16 Mar 2015 14:06:37 +0100 Subject: [PATCH] DocumentManager: Treat documents without path as temporary Treat documents without path as temporary when trying to come up with a directory to open the file dialog in. Task-number: QTCREATORBUG-14131 Change-Id: I266fe6608b7c98b479f86412a0892413e1b99bb2 Reviewed-by: Eike Ziller --- src/plugins/coreplugin/documentmanager.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp index 165b44b04fa..73b035eda34 100644 --- a/src/plugins/coreplugin/documentmanager.cpp +++ b/src/plugins/coreplugin/documentmanager.cpp @@ -1257,8 +1257,9 @@ void readSettings() QString DocumentManager::fileDialogInitialDirectory() { - if (EditorManager::currentDocument() && !EditorManager::currentDocument()->isTemporary()) - return QFileInfo(EditorManager::currentDocument()->filePath().toString()).absolutePath(); + IDocument *doc = EditorManager::currentDocument(); + if (doc && !doc->isTemporary() && !doc->filePath().isEmpty()) + return doc->filePath().toFileInfo().absolutePath(); if (!d->m_defaultLocationForNewFiles.isEmpty()) return d->m_defaultLocationForNewFiles; return d->m_lastVisitedDirectory;