From f12e095fd4828f7f331140601d6323dd56a40dad Mon Sep 17 00:00:00 2001 From: Marco Benelli Date: Wed, 25 Oct 2017 14:59:55 +0200 Subject: [PATCH] Qmljs: check pointer to ModelManagerInterface Task-number: QTCREATORBUG-19152 Change-Id: I3c511d15af943cc92c35a3c3d823080415940780 Reviewed-by: Erik Verbruggen --- src/libs/qmljs/qmljsinterpreter.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp index 7e1833dac61..d78ada13f77 100644 --- a/src/libs/qmljs/qmljsinterpreter.cpp +++ b/src/libs/qmljs/qmljsinterpreter.cpp @@ -2239,11 +2239,13 @@ ImportInfo ImportInfo::pathImport(const QString &docPath, const QString &path, } else if (importFileInfo.isDir()) { info.m_type = ImportType::Directory; } else if (path.startsWith(QLatin1String("qrc:"))) { + ModelManagerInterface *model = ModelManagerInterface::instance(); info.m_path = path; - if (ModelManagerInterface::instance()->filesAtQrcPath(info.path()).isEmpty()) - info.m_type = ImportType::QrcDirectory; - else - info.m_type = ImportType::QrcFile; + info.m_type = !model + ? ImportType::UnknownFile + : model->filesAtQrcPath(info.path()).isEmpty() + ? ImportType::QrcDirectory + : ImportType::QrcFile; } else { info.m_type = ImportType::UnknownFile; }