[empathy] Don't try to close channels thrice.



commit 9010489b970c479609c095ec6b15b1e893e8b548
Author: Will Thompson <will thompson collabora co uk>
Date:   Thu Feb 25 12:30:56 2010 +0000

    Don't try to close channels thrice.
    
    Fixes: #611071

 libempathy/empathy-tp-chat.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index a7f23b2..cba102a 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -1828,13 +1828,17 @@ empathy_tp_chat_leave (EmpathyTpChat *self)
 	GArray *array;
 
 	if (!tp_proxy_has_interface_by_id (priv->channel,
-		TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP))
+		TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP)) {
 		empathy_tp_chat_close (self);
+		return;
+	}
 
 	self_handle = tp_channel_group_get_self_handle (priv->channel);
-	if (self_handle == 0)
+	if (self_handle == 0) {
 		/* we are not member of the channel */
 		empathy_tp_chat_close (self);
+		return;
+	}
 
 	array = g_array_sized_new (FALSE, FALSE, sizeof (TpHandle), 1);
 	g_array_insert_val (array, 0, self_handle);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]