From 446978af11ab886d734ca3972dcd73f847df9fbc Mon Sep 17 00:00:00 2001 From: Milian Wolff Date: Thu, 20 Apr 2017 12:05:11 +0200 Subject: Gracefully handle early deregistration of objects When an object is deregistered before the signal handler got initializated, we asserted. Now, we check for this case and skip the signal handler removal when it wasn't set up yet. Change-Id: I7abad204cbab72be7729d42f58ce63babd2310d8 Task-number: QTBUG-60250 Reviewed-by: Kai Dohmen Reviewed-by: Konstantin Tokarev --- src/webchannel/qmetaobjectpublisher.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/webchannel/qmetaobjectpublisher.cpp b/src/webchannel/qmetaobjectpublisher.cpp index 148404d..dcc589c 100644 --- a/src/webchannel/qmetaobjectpublisher.cpp +++ b/src/webchannel/qmetaobjectpublisher.cpp @@ -454,8 +454,12 @@ void QMetaObjectPublisher::objectDestroyed(const QObject *object) Q_ASSERT(removed); Q_UNUSED(removed); - signalHandler.remove(object); - signalToPropertyMap.remove(object); + // only remove from handler when we initialized the property updates + // cf: https://bugreports.qt.io/browse/QTBUG-60250 + if (propertyUpdatesInitialized) { + signalHandler.remove(object); + signalToPropertyMap.remove(object); + } pendingPropertyUpdates.remove(object); } -- cgit v1.2.1