From 673cc77dd07d39cbda39415a8a5c9f885cf58c5c Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@digia.com>
Date: Mon, 3 Nov 2014 14:34:34 +0100
Subject: [PATCH] QmlProfiler: Disable loading of trace files while recording
 data

Change-Id: I32f1c6640bdde278e8342886f30e50a78c61b120
Task-number: QTCREATORBUG-13321
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
---
 src/plugins/qmlprofiler/qmlprofilertool.cpp | 6 ++++++
 src/plugins/qmlprofiler/qmlprofilertool.h   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp
index 047f1f67048..5da9e75a7d4 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp
@@ -502,6 +502,11 @@ void QmlProfilerTool::showErrorDialog(const QString &error)
     errorDialog->show();
 }
 
+void QmlProfilerTool::showLoadOption()
+{
+    d->m_loadQmlTrace->setEnabled(!d->m_profilerState->serverRecording());
+}
+
 void QmlProfilerTool::showSaveOption()
 {
     d->m_saveQmlTrace->setEnabled(!d->m_profilerModelManager->isEmpty());
@@ -685,6 +690,7 @@ void QmlProfilerTool::clientRecordingChanged()
 
 void QmlProfilerTool::serverRecordingChanged()
 {
+    showLoadOption();
     if (d->m_profilerState->currentState() == QmlProfilerStateManager::AppRunning) {
         // clear the old data each time we start a new profiling session
         if (d->m_profilerState->serverRecording()) {
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.h b/src/plugins/qmlprofiler/qmlprofilertool.h
index a3462566aa6..ef8e58917bd 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.h
+++ b/src/plugins/qmlprofiler/qmlprofilertool.h
@@ -84,6 +84,7 @@ private slots:
     void updateTimeDisplay();
 
     void showSaveOption();
+    void showLoadOption();
     void showSaveDialog();
     void showLoadDialog();