Merge pull request #1523 from forslund/bugfix/shutdown-sheduled-events
Fix cancel_all_repeating_events()pull/1532/head
commit
3e2f008c12
|
@ -968,6 +968,8 @@ class MycroftSkill(object):
|
||||||
if not name:
|
if not name:
|
||||||
name = self.name + handler.__name__
|
name = self.name + handler.__name__
|
||||||
name = self._unique_name(name)
|
name = self._unique_name(name)
|
||||||
|
if repeat:
|
||||||
|
self.scheduled_repeats.append(name)
|
||||||
|
|
||||||
data = data or {}
|
data = data or {}
|
||||||
self.add_event(name, handler, once=not repeat)
|
self.add_event(name, handler, once=not repeat)
|
||||||
|
@ -1012,7 +1014,6 @@ class MycroftSkill(object):
|
||||||
if not when:
|
if not when:
|
||||||
when = datetime.now() + timedelta(seconds=frequency)
|
when = datetime.now() + timedelta(seconds=frequency)
|
||||||
self._schedule_event(handler, when, data, name, frequency)
|
self._schedule_event(handler, when, data, name, frequency)
|
||||||
self.scheduled_repeats.append(name)
|
|
||||||
else:
|
else:
|
||||||
LOG.debug('The event is already scheduled, cancel previous '
|
LOG.debug('The event is already scheduled, cancel previous '
|
||||||
'event if this scheduling should replace the last.')
|
'event if this scheduling should replace the last.')
|
||||||
|
|
Loading…
Reference in New Issue