From 6a352361a54afa4b340e88771ff885ee32b932f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lutz=20Sch=C3=B6nemann?= Date: Tue, 30 Sep 2014 16:34:33 +0200 Subject: Fix: Delete objects even when no transport is available The issue is that objects that get deleted will not be removed from the internal lists. This patch checks for destroyed signals in cases when no transport is available (no connection established). cherry picked from commit 037c67962de3d74669c55a9db456ffd38a28480f Change-Id: I24e345dcbfe88e15031d288eb65abb2c3066d4c0 Reviewed-by: Milian Wolff --- src/webchannel/qmetaobjectpublisher.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/webchannel/qmetaobjectpublisher.cpp b/src/webchannel/qmetaobjectpublisher.cpp index 90c39ff..b3ae23c 100644 --- a/src/webchannel/qmetaobjectpublisher.cpp +++ b/src/webchannel/qmetaobjectpublisher.cpp @@ -368,6 +368,8 @@ QJsonValue QMetaObjectPublisher::invokeMethod(QObject *const object, const int m void QMetaObjectPublisher::signalEmitted(const QObject *object, const int signalIndex, const QVariantList &arguments) { if (!webChannel || webChannel->d_func()->transports.isEmpty()) { + if (signalIndex == s_destroyedSignalIndex) + objectDestroyed(object); return; } if (!signalToPropertyMap.value(object).contains(signalIndex)) { -- cgit v1.2.1