Merge branch 'develop' into roster

2011-04-11 14:23:39 -04:00 · 2011-04-11 14:23:39 -04:00 · b9bf30e095
commit b9bf30e095
parent b60c51ef13 1d891858b6
1 changed files with 1 additions and 0 deletions
--- 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()