summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristiaan Janssen <christiaan.janssen@digia.com>2013-06-25 16:54:21 +0200
committerKai Koehne <kai.koehne@digia.com>2013-06-25 18:12:11 +0300
commitbf467e258bd2186a3ddc44b4f865f6836df3c034 (patch)
treed7ec423254ba0441440633543d8087451d3f7703
parent67d66abf8f61d280020ef76d6f7b20904f30832c (diff)
downloadqt-creator-bf467e258bd2186a3ddc44b4f865f6836df3c034.tar.gz
QmlProfiler: avoid idle engine cancelling other engine's process
Task-number: QTCREATORBUG-9643 Change-Id: Idd78aeb94af939d0641ad8e18c2e4f1a9bca4ba5 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
-rw-r--r--plugins/qmlprofiler/qmlprofilerengine.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/qmlprofiler/qmlprofilerengine.cpp b/plugins/qmlprofiler/qmlprofilerengine.cpp
index 9b71068c37..05b702c228 100644
--- a/plugins/qmlprofiler/qmlprofilerengine.cpp
+++ b/plugins/qmlprofiler/qmlprofilerengine.cpp
@@ -259,6 +259,10 @@ void QmlProfilerEngine::cancelProcess()
{
QTC_ASSERT(d->m_profilerState, return);
+ // no process to be canceled? (there might be multiple engines, but only one runs a process)
+ if (!d->m_runner)
+ return;
+
switch (d->m_profilerState->currentState()) {
case QmlProfilerStateManager::AppReadyToStop : {
d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppStopped);