From d4fe5310d6350e7725e4df24959e10d05176fd52 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Thu, 11 May 2017 16:06:03 +0200 Subject: [PATCH] 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 --- src/plugins/qmlprofiler/qmlprofilertraceview.cpp | 2 ++ 1 file changed, 2 insertions(+) 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