From 6f5c5a56dbef6545dedea1948771000698bcab5d Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 9 Aug 2017 13:45:08 +0200 Subject: [PATCH] QmlProfiler: reportStopped() only when entering Idle Change-Id: I291ff6506a16e294165109a89f2acf22d24d7928 Reviewed-by: Ulf Hermann --- src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp index 47940623251..fff1a528006 100644 --- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp @@ -133,10 +133,11 @@ void QmlProfilerRunner::stop() switch (d->m_profilerState->currentState()) { case QmlProfilerStateManager::AppRunning: d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppStopRequested); - return; // Don't reportStopped() here. We are still waiting for data. + break; case QmlProfilerStateManager::AppStopRequested: // Pressed "stop" a second time. Kill the application without collecting data d->m_profilerState->setCurrentState(QmlProfilerStateManager::Idle); + reportStopped(); break; case QmlProfilerStateManager::Idle: case QmlProfilerStateManager::AppDying: @@ -149,7 +150,6 @@ void QmlProfilerRunner::stop() } break; } - reportStopped(); } void QmlProfilerRunner::notifyRemoteFinished()