summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLouis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne@collabora.co.uk>2010-10-22 13:02:31 -0400
committerLouis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne@collabora.co.uk>2010-11-24 16:14:59 -0500
commit2de84b74d622697c3281a4b9abaf29c354fee6b4 (patch)
tree99ced55c39a6cfb11c95ca25a305be1f8282cd58
parent4f186b307b7d1ccc649d5d6fbc1c474207b038bc (diff)
Don't throw an exception when trying to remove an invalid channel
-rw-r--r--src/server/conn.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/conn.py b/src/server/conn.py
index 9d33e78..bdc8c8c 100644
--- a/src/server/conn.py
+++ b/src/server/conn.py
@@ -218,6 +218,8 @@ class Connection(_Connection, DBusProperties):
suppress_handler)
def remove_channel(self, channel):
+ if channel not in self._channels:
+ return
self._channels.remove(channel)
self.ChannelClosed(channel._object_path)