From b1048748d0786955389ed84e4b170cad25f03abd Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Sun, 2 Jul 2023 15:19:28 +0800 Subject: [PATCH] Fix: [ALAS] Handle None in interval_clear() --- module/base/base.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/module/base/base.py b/module/base/base.py index a091c3b75..a5c7b239c 100644 --- a/module/base/base.py +++ b/module/base/base.py @@ -212,10 +212,11 @@ class ModuleBase: self.interval_reset(b, interval) return - if button.name in self.interval_timer: - self.interval_timer[button.name].reset() - else: - self.interval_timer[button.name] = Timer(interval).reset() + if button is not None: + if button.name in self.interval_timer: + self.interval_timer[button.name].reset() + else: + self.interval_timer[button.name] = Timer(interval).reset() def interval_clear(self, button, interval=5): if isinstance(button, (list, tuple)): @@ -223,10 +224,11 @@ class ModuleBase: self.interval_clear(b, interval) return - if button.name in self.interval_timer: - self.interval_timer[button.name].clear() - else: - self.interval_timer[button.name] = Timer(interval).clear() + if button is not None: + if button.name in self.interval_timer: + self.interval_timer[button.name].clear() + else: + self.interval_timer[button.name] = Timer(interval).clear() def interval_is_reached(self, button, interval=5): if button.name in self.interval_timer: