From 53b80e9b51eb5352d1a46609c93b752609ed8100 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Wed, 26 Apr 2017 12:20:51 +0200 Subject: [PATCH] Clang: Check for nullptr Task-number: QTCREATORBUG-18087 Change-Id: Icf8100d84a415995a8d913bc776699c895882e97 Reviewed-by: Christian Stenger --- src/plugins/cppeditor/cppeditor.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index 19b261c42f4..9b027d4135c 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -542,7 +542,8 @@ void CppEditorWidget::renameSymbolUnderCursorClang() { using ClangBackEnd::SourceLocationsContainer; - if (refactoringEngine()->isUsable()) { + ProjectPart *theProjectPart = projectPart(); + if (refactoringEngine()->isUsable() && theProjectPart) { d->m_useSelectionsUpdater.abortSchedule(); QPointer cppEditorWidget = this; @@ -569,7 +570,7 @@ void CppEditorWidget::renameSymbolUnderCursorClang() refactoringEngine()->startLocalRenaming(textCursor(), textDocument()->filePath(), document()->revision(), - projectPart(), + theProjectPart, std::move(renameSymbols)); viewport()->setCursor(Qt::BusyCursor);