summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@qt.io>2022-12-13 17:27:17 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-12-13 17:58:35 +0000
commit044635dd0c1e9c8093ba9e04356499b29ab9f229 (patch)
tree6bba8a9a18b0b62191e75cc746476b9e89e88362
parente545a64fbd3d8d50ac8f26cab1991418d25d94fa (diff)
Fix calling initialize() twice in QIfMediaDeviceDiscoveryModel
This caused the signals to be emitted twice as well and calling resetModel() a second time. resetModel() deleted all elements although it didn't own them and this caused a crash when calling resetModel() again with a list of dangling pointers. Change-Id: Iad0455e10867235aae2478704acdcb53fbce1930 Reviewed-by: Robert Griebl <robert.griebl@qt.io> (cherry picked from commit 716c858a253e3abebc08a72b3426735f55ecd3e7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/ifmedia/qifmediadevicediscoverymodel.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/ifmedia/qifmediadevicediscoverymodel.cpp b/src/ifmedia/qifmediadevicediscoverymodel.cpp
index 8c5c1b1d..f00d1ecf 100644
--- a/src/ifmedia/qifmediadevicediscoverymodel.cpp
+++ b/src/ifmedia/qifmediadevicediscoverymodel.cpp
@@ -41,7 +41,6 @@ void QIfMediaDeviceDiscoveryModelPrivate::resetModel(const QList<QIfServiceObjec
{
Q_Q(QIfMediaDeviceDiscoveryModel);
q->beginResetModel();
- qDeleteAll(m_deviceList);
m_deviceList.clear();
m_deviceList = deviceList;
q->endResetModel();
@@ -282,8 +281,6 @@ void QIfMediaDeviceDiscoveryModel::connectToServiceObject(QIfServiceObject *serv
d, &QIfMediaDeviceDiscoveryModelPrivate::onDeviceRemoved);
QIfAbstractFeatureListModel::connectToServiceObject(serviceObject);
-
- backend->initialize();
}
/*!