summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2012-05-10 18:22:10 +0200
committermathieui <mathieui@mathieui.net>2012-05-10 18:22:10 +0200
commit5498ad37c8e1235863040eeaa854ac5d3e6cfc89 (patch)
treed3c32dd3e057bfa4186fa277e68e179ee4fafdbf
parentc0c0b16218aca64785307a22114f0212b3758534 (diff)
downloadpoezio-5498ad37c8e1235863040eeaa854ac5d3e6cfc89.tar.gz
poezio-5498ad37c8e1235863040eeaa854ac5d3e6cfc89.tar.bz2
poezio-5498ad37c8e1235863040eeaa854ac5d3e6cfc89.tar.xz
poezio-5498ad37c8e1235863040eeaa854ac5d3e6cfc89.zip
Prevent iq errors & timeouts on /join completion
-rw-r--r--src/core.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core.py b/src/core.py
index 9b704682..94c1af5a 100644
--- a/src/core.py
+++ b/src/core.py
@@ -1714,7 +1714,10 @@ class Core(object):
if jid.resource or jid.full.endswith('/'):
# we are writing the resource: complete the node
if not the_input.last_completion:
- response = self.xmpp.plugin['xep_0030'].get_items(jid=jid.server, block=True, timeout=1)
+ try:
+ response = self.xmpp.plugin['xep_0030'].get_items(jid=jid.server, block=True, timeout=1)
+ except:
+ response = None
if response:
items = response['disco_items'].get_items()
else: