aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
diff options
context:
space:
mode:
authorUlf Hermann <[email protected]>2017-05-11 16:06:03 +0200
committerUlf Hermann <[email protected]>2017-05-11 14:47:57 +0000
commitd4fe5310d6350e7725e4df24959e10d05176fd52 (patch)
treed04bc014bccbc8522d86dad59a2fbc6b11f3786a /src/plugins/qmlprofiler/qmlprofilertraceview.cpp
parentff6a20687dbf008d1ffafb4a01a9cd72a8045227 (diff)
QmlProfiler: Don't delete suspended models when acquiring is aborted
AcquiringData to ClearingData is a valid transition, for example when the application crashes. We don't want to drop all models then. Change-Id: Ibb1b5a551e0dbec121a44054d36c132d038153f4 Reviewed-by: Christian Kandeler <[email protected]>
Diffstat (limited to 'src/plugins/qmlprofiler/qmlprofilertraceview.cpp')
-rw-r--r--src/plugins/qmlprofiler/qmlprofilertraceview.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
index 22fad39df91..8519d124223 100644
--- a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
@@ -114,6 +114,8 @@ QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, QmlProfilerViewManag
break;
case QmlProfilerModelManager::ClearingData:
d->m_zoomControl->clear();
+ if (!d->m_suspendedModels.isEmpty())
+ break; // Models are suspended already. AcquiringData was aborted.
// Fall through
case QmlProfilerModelManager::AcquiringData:
// Temporarily remove the models, while we're changing them