[Telepathy-commits] [telepathy-qt4/master] Change nameownerchanged handling slot to not call invalidate if the object is already invalidated.

[George Goldberg]

---
 TelepathyQt4/Client/dbus-proxy.cpp |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/TelepathyQt4/Client/dbus-proxy.cpp b/TelepathyQt4/Client/dbus-proxy.cpp
index 7915ec4..7fb33e0 100644
--- a/TelepathyQt4/Client/dbus-proxy.cpp
+++ b/TelepathyQt4/Client/dbus-proxy.cpp
@@ -151,7 +151,9 @@ void StatefulDBusProxy::emitInvalidated()
 
 void StatefulDBusProxy::onServiceOwnerChanged(const QString& name, const QString& oldOwner, const QString& newOwner)
 {
-    if (name == busName()) {
+    // We only want to invalidate this object if it is not already invalidated,
+    // and it's (not any other object's) name owner changed signal is emitted.
+    if (isValid() && (name == busName())) {
         // FIXME: where do the error texts come from? the spec?
         invalidate("NAME_OWNER_CHANGED", "NameOwnerChanged() received for this object.");
     }
-- 
1.5.6.5