summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2017-05-08 14:18:03 +0200
committerTobias Hunger <tobias.hunger@qt.io>2017-05-08 12:54:12 +0000
commitd056df2c15f0158b7076770fc2cb56cb843b3370 (patch)
tree5312c7b1efc21e3f749d4c7b15356b466c75ea82
parent9bb80c0e80e1d2c6a804066c5d52ffe8cda34be1 (diff)
downloadqt-creator-d056df2c15f0158b7076770fc2cb56cb843b3370.tar.gz
ProjectNodes: Fix crash in FolderNode::addFileFilter()
Task-number: QTCREATORBUG-18160 Change-Id: I1b8fe9f949ca9aa04858321317ebb13eb01236ab Reviewed-by: hjk <hjk@qt.io>
-rw-r--r--src/plugins/projectexplorer/projectnodes.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp
index 03cc5adc1e..7ff2f0e678 100644
--- a/src/plugins/projectexplorer/projectnodes.cpp
+++ b/src/plugins/projectexplorer/projectnodes.cpp
@@ -630,7 +630,8 @@ void FolderNode::setIcon(const QIcon &icon)
QString FolderNode::addFileFilter() const
{
- return parentFolderNode()->addFileFilter();
+ FolderNode *fn = parentFolderNode();
+ return fn ? fn->addFileFilter() : QString();
}
bool FolderNode::supportsAction(ProjectAction action, Node *node) const