From 5e2ad9457f8681aa14b8a2f4029a88c89bbcdbbd Mon Sep 17 00:00:00 2001 From: David Schulz Date: Thu, 1 Mar 2018 12:33:48 +0100 Subject: [PATCH] ClangCodeModel: Fix crash on git diff/show currentEditorChanged is emitted also for none TextEditors, so check the qobject casted TextDocument before accessing it. Change-Id: I57080221bec34b879f21e022029524818ea92569 Reviewed-by: Christian Stenger --- .../clangcodemodel/clangcurrentdocumentfilter.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp b/src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp index d5a84b611d4..adc4507b88b 100644 --- a/src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp +++ b/src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp @@ -176,11 +176,12 @@ void ClangCurrentDocumentFilter::onCurrentEditorChanged(Core::IEditor *newCurren m_currentEditor = newCurrent; Core::IDocument *document = m_currentEditor->document(); QTC_ASSERT(document, return;); - auto *textDocument = qobject_cast(document); - m_currentPath = textDocument->filePath().toString(); - } else { - reset(); + if (auto *textDocument = qobject_cast(document)) { + m_currentPath = textDocument->filePath().toString(); + return; + } } + reset(); } } // namespace ClangCodeModel