summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2013-06-25 17:13:51 +0200
committerKai Koehne <kai.koehne@digia.com>2013-06-26 11:52:53 +0200
commitc219a5b5142752fab50fe761e815959cc16fabe1 (patch)
treeccaeec5a55d76a9de93af02fa118a05afe8b0b9e
parente02788b8cef93bd78ae1ce4bca6f242f9e9bfe38 (diff)
downloadqt-creator-c219a5b5142752fab50fe761e815959cc16fabe1.tar.gz
QmlProfiler: Avoid idle engine cancelling other engine's process
Task-number: QTCREATORBUG-9643 Change-Id: Ia0a2427a186fd9ad24e1cf620df48be13032a69b Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
-rw-r--r--src/plugins/qmlprofiler/qmlprofilerengine.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilerengine.cpp b/src/plugins/qmlprofiler/qmlprofilerengine.cpp
index 6914286dc6..8523e3d95e 100644
--- a/src/plugins/qmlprofiler/qmlprofilerengine.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerengine.cpp
@@ -249,6 +249,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);