QmlProfiler: Fixing regression for non-recording runs

Reviewed-by: Kai Koehne

1 files changed, 13 insertions, 1 deletions

diff --git a/src/plugins/qmlprofiler/qmlprofilerengine.cpp b/src/plugins/qmlprofiler/qmlprofilerengine.cpp
index 3489ed1d1c..2862dd184f 100644
--- a/src/plugins/qmlprofiler/qmlprofilerengine.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerengine.cpp
@@ -73,6 +73,7 @@ public:
     QProcess *m_process;
     bool m_running;
     bool m_fetchingData;
+    bool m_delayedDelete;
 };
 
 QmlProfilerEngine::QmlProfilerEngine(const Analyzer::AnalyzerStartParameters &sp, ProjectExplorer::RunConfiguration *runConfiguration)
@@ -83,6 +84,7 @@ QmlProfilerEngine::QmlProfilerEngine(const Analyzer::AnalyzerStartParameters &sp
     d->m_process = 0;
     d->m_running = false;
     d->m_fetchingData = false;
+    d->m_delayedDelete = false;
 }
 
 QmlProfilerEngine::~QmlProfilerEngine()
@@ -96,14 +98,18 @@ void QmlProfilerEngine::start()
 {
     d->launchperfmonitor();
     d->m_running = true;
+    d->m_delayedDelete = false;
 
     emit processRunning();
 }
 
 void QmlProfilerEngine::stop()
 {
-    if (d->m_fetchingData)
+    if (d->m_fetchingData) {
+        if (d->m_running)
+            d->m_delayedDelete = true;
         emit stopRecording();
+    }
     else
         finishProcess();
 }
@@ -120,6 +126,12 @@ void QmlProfilerEngine::setFetchingData(bool b)
     d->m_fetchingData = b;
 }
 
+void QmlProfilerEngine::dataReceived() {
+    if (d->m_delayedDelete)
+        finishProcess();
+    d->m_delayedDelete = false;
+}
+
 void QmlProfilerEngine::finishProcess()
 {
     if (d->m_running) {