From 50465bc7e25d56d0624fafb4050972f5b8dbcd36 Mon Sep 17 00:00:00 2001 From: Gordon Shumway Date: Wed, 19 Feb 2020 05:54:34 -0500 Subject: [PATCH] Jeopardy: minor edit to last commit --- Jeopardy/plugin.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Jeopardy/plugin.py b/Jeopardy/plugin.py index 493a2fc..2ff1e5a 100644 --- a/Jeopardy/plugin.py +++ b/Jeopardy/plugin.py @@ -340,7 +340,7 @@ class Jeopardy(callbacks.Plugin): schedule.addEvent(noTime, self.endTime, 'end_%s' % self.channel) if self.showBlank: self.hint() - elif self.timeout > 0 and self.showHints or self.showTime: + elif self.showHints or self.showTime: eventTime = time.time() + self.waitTime if eventTime < self.endTime: schedule.addEvent(event, eventTime, 'event_%s' % self.channel) @@ -457,10 +457,11 @@ class Jeopardy(callbacks.Plugin): def event(): self.timedEvent() if self.timeout > 0: - eventTime = time.time() + self.waitTime reply = self.hint_template.render(hint = self.currentHint, time = round(self.endTime - time.time())) - if self.showHints or self.showTime and eventTime < self.endTime: - schedule.addEvent(event, eventTime, 'event_%s' % self.channel) + if self.showHints or self.showTime: + eventTime = time.time() + self.waitTime + if eventTime < self.endTime: + schedule.addEvent(event, eventTime, 'event_%s' % self.channel) else: reply = self.hint_template.render(hint = self.currentHint, time = None) self.reply(reply)