aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Fritz2010-11-17 01:58:20 (GMT)
committerNathan Fritz2010-11-17 01:58:20 (GMT)
commit45991e47eeab97f0411139c5b1627ac6350de3d0 (patch)
tree4491e8eeef90129b53b3a49abade19134e36b617
parentb8f40eb8431dd0965d6ed3fd61956f4c91729202 (diff)
downloadslixmpp-sleek-1.0-Beta4.tar.gz
slixmpp-sleek-1.0-Beta4.tar.xz
scheduler no longer waits for the next event before exitingsleek-1.0-Beta41.0-Beta4
-rw-r--r--sleekxmpp/xmlstream/scheduler.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/sleekxmpp/xmlstream/scheduler.py b/sleekxmpp/xmlstream/scheduler.py
index e0324cb..1435910 100644
--- a/sleekxmpp/xmlstream/scheduler.py
+++ b/sleekxmpp/xmlstream/scheduler.py
@@ -149,6 +149,8 @@ class Scheduler(object):
if wait <= 0.0:
newtask = self.addq.get(False)
else:
+ if wait >= 3.0:
+ wait = 3.0
newtask = self.addq.get(True, wait)
except queue.Empty:
cleanup = []