diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-06-13 08:52:23 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-06-13 09:10:47 +0200 |
| commit | 5933136b199d14530d20feea7182ecb83503f5cf (patch) | |
| tree | 2c047f7563304cffaefd0cc912e11a2334ce2871 | |
| parent | 21007a6b5d70bbe8e0b0c526799805a5b263ed3b (diff) | |
| download | qt-creator-5933136b199d14530d20feea7182ecb83503f5cf.tar.gz | |
Fix crash when adding files from window menu
Introduced by 2ad3147542a45436733ddd7014993bcc3022a654
Task-number: QTCREATORBUG-12409
Change-Id: I422d315c5b9d22052251a0869d314adff7741af0
Sanity-Review: Qt Sanity Bot <qt_sanitybot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakenodes.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index b0f7044190..369121c95e 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -1069,7 +1069,7 @@ bool QmakePriFileNode::renameFile(const QString &filePath, const QString &newFil ProjectExplorer::FolderNode::AddNewInformation QmakePriFileNode::addNewInformation(const QStringList &files, Node *context) const { Q_UNUSED(files) - return ProjectExplorer::FolderNode::AddNewInformation(QFileInfo(path()).fileName(), context->projectNode() == this ? 120 : 90); + return ProjectExplorer::FolderNode::AddNewInformation(QFileInfo(path()).fileName(), context && context->projectNode() == this ? 120 : 90); } bool QmakePriFileNode::priFileWritable(const QString &path) @@ -1576,7 +1576,7 @@ bool QmakeProFileNode::showInSimpleTree() const ProjectExplorer::FolderNode::AddNewInformation QmakeProFileNode::addNewInformation(const QStringList &files, Node *context) const { Q_UNUSED(files) - return AddNewInformation(QFileInfo(path()).fileName(), context->projectNode() == this ? 120 : 100); + return AddNewInformation(QFileInfo(path()).fileName(), context && context->projectNode() == this ? 120 : 100); } bool QmakeProFileNode::showInSimpleTree(QmakeProjectType projectType) const |