From d8077db3fbebb8701b10f0d37f1b228d4f708cbe Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Thu, 14 Nov 2013 10:35:54 +0100 Subject: CppTools: Fix crash for documents without file paths Since commit 566be09 we might reparse the current document if the current editor changes. This is fine as long as the current document has a file path, which is not always true, especially for the documents created in the FakeVim tests. Task-number: QTCREATORBUG-10767 Change-Id: Ibe00ef8bb6a144e2ba09b311025d238c2dcde112 Reviewed-by: Christian Stenger Reviewed-by: hjk --- src/plugins/cpptools/cpptoolseditorsupport.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/cpptools/cpptoolseditorsupport.cpp') diff --git a/src/plugins/cpptools/cpptoolseditorsupport.cpp b/src/plugins/cpptools/cpptoolseditorsupport.cpp index c720b3b73a..ed039bf900 100644 --- a/src/plugins/cpptools/cpptoolseditorsupport.cpp +++ b/src/plugins/cpptools/cpptoolseditorsupport.cpp @@ -286,7 +286,7 @@ static void parse(QFutureInterface &future, CppEditorSupport *support) QSharedPointer updater = support->snapshotUpdater(); updater->update(cmm->workingCopy()); - cmm->finishedRefreshingSourceFiles(QStringList(updater->document()->fileName())); + cmm->finishedRefreshingSourceFiles(QStringList(updater->fileInEditor())); future.setProgressValue(1); } @@ -298,7 +298,7 @@ void CppEditorSupport::updateDocumentNow() } else { m_updateDocumentTimer->stop(); - if (m_fileIsBeingReloaded) + if (m_fileIsBeingReloaded || fileName().isEmpty()) return; if (m_highlightingSupport && !m_highlightingSupport->requiresSemanticInfo()) -- cgit v1.2.1