feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlProfiler: Check runConfiguration for 0 before accessing it

Browse Source 
Change-Id: I274d7a75313a899a2b0c05fddbe8e189f9b99156
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2016-02-29 15:03:09 +01:00
parent a286c8da44
commit dfa8e27968
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/qmlprofiler/qmlprofilertool.cpp
View File

@@ -193,15 +193,17 @@ QmlProfilerTool::~QmlProfilerTool()
AnalyzerRunControl *QmlProfilerTool::createRunControl(const AnalyzerStartParameters &sp,
RunConfiguration *runConfiguration)
{
QmlProfilerRunConfigurationAspect *aspect = static_cast<QmlProfilerRunConfigurationAspect *>(
runConfiguration->extraAspect(Constants::SETTINGS));
QTC_ASSERT(aspect, return 0);
QmlProfilerSettings *settings = static_cast<QmlProfilerSettings *>(aspect->currentSettings());
QTC_ASSERT(settings, return 0);
d->m_profilerConnections->setFlushInterval(settings->flushEnabled() ?
settings->flushInterval() : 0);
if (runConfiguration) {
QmlProfilerRunConfigurationAspect *aspect =
static_cast<QmlProfilerRunConfigurationAspect *>(
runConfiguration->extraAspect(Constants::SETTINGS));
if (aspect) {
QmlProfilerSettings *settings =
static_cast<QmlProfilerSettings *>(aspect->currentSettings());
d->m_profilerConnections->setFlushInterval((settings && settings->flushEnabled()) ?
settings->flushInterval() : 0);
}
}
QmlProfilerRunControl *engine = new QmlProfilerRunControl(sp, runConfiguration);