From b814bea0ab0c838bc77d989c79a89f8f7f726a29 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 15 Mar 2017 15:02:08 +0100 Subject: [PATCH] ProjectExplorer: Fix crash on reloading projects Partially reverts 6e91fe50. Change-Id: I91f2460fcee79deeeb55cc4955fca4726b5276bc Reviewed-by: Nikolai Kosjar Reviewed-by: Tim Jenssen Reviewed-by: Tobias Hunger --- src/plugins/projectexplorer/project.cpp | 2 +- src/plugins/qmakeprojectmanager/qmakenodes.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp index 6c97502dd6b..43870201dbd 100644 --- a/src/plugins/projectexplorer/project.cpp +++ b/src/plugins/projectexplorer/project.cpp @@ -419,7 +419,7 @@ void Project::setDocument(Core::IDocument *doc) d->m_document = doc; if (!d->m_rootProjectNode) { - auto newRoot = new ProjectNode(projectFilePath()); + auto newRoot = new ProjectNode(projectDirectory()); newRoot->setDisplayName(displayName()); newRoot->addNode(new FileNode(projectFilePath(), FileType::Project, false)); setRootProjectNode(newRoot); diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.h b/src/plugins/qmakeprojectmanager/qmakenodes.h index 67878b23570..89f6039dd6e 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.h +++ b/src/plugins/qmakeprojectmanager/qmakenodes.h @@ -69,10 +69,10 @@ public: QmakeProFileNode *proFileNode() const; protected: - QmakeProject *m_project; + QmakeProject *m_project = nullptr; private: - QmakeProFileNode *m_qmakeProFileNode; + QmakeProFileNode *m_qmakeProFileNode = nullptr; }; // Implements ProjectNode for qmake .pro files