feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlProfiler: Guard state widget against unexpected deletion order

Browse Source 
If the model manager or the state manager disappear before the parent
widget, we might still get a timer update in between.

Change-Id: I6a67868615ef9d570e2ce438d9d9bd88b1035cc2
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Ulf Hermann
2018-01-09 17:07:53 +01:00
parent 4d99f47974
commit ff182d1c97
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qmlprofiler/qmlprofilerstatewidget.cpp
View File

@@ -35,6 +35,7 @@
#include <QTime> #include <QTime>
#include <QDebug> #include <QDebug>
#include <QTimer> #include <QTimer>
#include <QPointer>
namespace QmlProfiler { namespace QmlProfiler {
namespace Internal { namespace Internal {
@@ -46,8 +47,8 @@ class QmlProfilerStateWidget::QmlProfilerStateWidgetPrivate
QLabel *text; QLabel *text;
QmlProfilerStateManager *m_profilerState; QPointer<QmlProfilerStateManager> m_profilerState;
QmlProfilerModelManager *m_modelManager; QPointer<QmlProfilerModelManager> m_modelManager;
QTimer timer; QTimer timer;
}; };
@@ -106,6 +107,12 @@ void QmlProfilerStateWidget::showText(const QString &text)
void QmlProfilerStateWidget::updateDisplay() void QmlProfilerStateWidget::updateDisplay()
{ {
if (!d->m_modelManager || !d->m_profilerState) {
d->timer.stop();
setVisible(false);
return;
}
// When application is being profiled // When application is being profiled
if (d->m_profilerState->serverRecording()) { if (d->m_profilerState->serverRecording()) {
// Heuristic to not show the number if the application will only send the events when it // Heuristic to not show the number if the application will only send the events when it
@@ -156,7 +163,8 @@ void QmlProfilerStateWidget::updateDisplay()
void QmlProfilerStateWidget::update() void QmlProfilerStateWidget::update()
{ {
QmlProfilerModelManager::State state = d->m_modelManager->state(); QmlProfilerModelManager::State state = d->m_modelManager ? d->m_modelManager->state()
: QmlProfilerModelManager::Empty;
if (state == QmlProfilerModelManager::AcquiringData if (state == QmlProfilerModelManager::AcquiringData
|| state == QmlProfilerModelManager::ProcessingData) { || state == QmlProfilerModelManager::ProcessingData) {
d->timer.start(); d->timer.start();