#2412: Handle the connection manager disconnecting and closing the connection other than PS closing it

1 files changed, 5 insertions, 2 deletions

diff --git a/src/buddy.py b/src/buddy.py
index 1f7a0ca..f533b22 100644
--- a/src/buddy.py
+++ b/src/buddy.py
@@ -342,8 +342,11 @@ class Buddy(ExportedGObject):
             if act.room_details[0] == tp_client:
                 act.buddy_apparently_left(self)
 
-        self.TelepathyHandleRemoved(conn.service_name, conn.object_path,
-                                    handle)
+        # if the Connection Manager disconnected other than
+        # PS stopping it, then we don't have a connection.
+        if conn:
+            self.TelepathyHandleRemoved(conn.service_name,
+                                        conn.object_path, handle)
         # the Owner can't disappear - that would be silly
         if not self._handles and not self._owner:
             self.emit('disappeared')