summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-04-11 14:23:39 -0400
committerLance Stout <lancestout@gmail.com>2011-04-11 14:23:39 -0400
commitb9bf30e095da565f02f3ed20dab6b378dba4ab7d (patch)
treef7b159873f15624ed047c3eaf6c7c8246ec99f48
parentb60c51ef13382c60ffc6f6f2eddea2a28cfd1c8c (diff)
parent1d891858b63c1e3ac10a39920c3e65159cfc8d72 (diff)
downloadslixmpp-b9bf30e095da565f02f3ed20dab6b378dba4ab7d.tar.gz
slixmpp-b9bf30e095da565f02f3ed20dab6b378dba4ab7d.tar.bz2
slixmpp-b9bf30e095da565f02f3ed20dab6b378dba4ab7d.tar.xz
slixmpp-b9bf30e095da565f02f3ed20dab6b378dba4ab7d.zip
Merge branch 'develop' into roster
-rw-r--r--sleekxmpp/xmlstream/scheduler.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/sleekxmpp/xmlstream/scheduler.py b/sleekxmpp/xmlstream/scheduler.py
index 0e711b4b..12deeddf 100644
--- a/sleekxmpp/xmlstream/scheduler.py
+++ b/sleekxmpp/xmlstream/scheduler.py
@@ -132,6 +132,7 @@ class Scheduler(object):
if threaded:
self.thread = threading.Thread(name='sheduler_process',
target=self._process)
+ self.thread.daemon = True
self.thread.start()
else:
self._process()