server.channel: do Close cleanup parts separately

For example, if we create a channel without a channel manager, the
first of these cleanups will fail, but the other two won't.

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

1 files changed, 10 insertions, 0 deletions

diff --git a/src/server/channel.py b/src/server/channel.py
index eb9a560..a82cc43 100644
--- a/src/server/channel.py
+++ b/src/server/channel.py
@@ -101,9 +101,19 @@ class Channel(_Channel, DBusProperties):
     @dbus.service.method(CHANNEL_INTERFACE, in_signature='', out_signature='')
     def Close(self):
         self.Closed()
+
+        # Do all these separately in case one works but another doesn't.
         try:
             self._chan_manager.remove_channel(self)
+        except:
+            pass
+
+        try:
             self._conn.remove_channel(self)
+        except:
+            pass
+
+        try:
             self.remove_from_connection()
         except:
             pass