Merge 'upstream/master'

1 files changed, 11 insertions, 7 deletions

diff --git a/xmpp-vala/src/module/xep/0410_muc_self_ping.vala b/xmpp-vala/src/module/xep/0410_muc_self_ping.vala
index 84772333..6511789e 100644
--- a/xmpp-vala/src/module/xep/0410_muc_self_ping.vala
+++ b/xmpp-vala/src/module/xep/0410_muc_self_ping.vala
@@ -1,16 +1,20 @@
 namespace Xmpp.Xep.MucSelfPing {
 
     public static async bool is_joined(XmppStream stream, Jid jid) {
-        Iq.Stanza iq_result = yield stream.get_module(Xmpp.Xep.Ping.Module.IDENTITY).send_ping(stream, jid);
+        try {
+            Iq.Stanza iq_result = yield stream.get_module(Xmpp.Xep.Ping.Module.IDENTITY).send_ping(stream, jid);
 
-        if (!iq_result.is_error()) {
-            return true;
-        } else {
-            var error_stanza = iq_result.get_error();
-            if (error_stanza.condition in new string[] {ErrorStanza.CONDITION_SERVICE_UNAVAILABLE, ErrorStanza.CONDITION_FEATURE_NOT_IMPLEMENTED}) {
-                // the client is joined, but the pinged client does not implement XMPP Ping
+            if (!iq_result.is_error()) {
                 return true;
+            } else {
+                var error_stanza = iq_result.get_error();
+                if (error_stanza.condition in new string[] {ErrorStanza.CONDITION_SERVICE_UNAVAILABLE, ErrorStanza.CONDITION_FEATURE_NOT_IMPLEMENTED}) {
+                    // the client is joined, but the pinged client does not implement XMPP Ping
+                    return true;
+                }
             }
+        } catch (IOError e) {
+            // Ignoring, same as if ping failed
         }
         return false;
     }