diff --git a/advent/__init__.py b/advent/__init__.py index 26b2e6d..218a275 100644 --- a/advent/__init__.py +++ b/advent/__init__.py @@ -1 +1 @@ -__version__="1.6.1b2" +__version__="1.6.1b3" diff --git a/advent/advent.py b/advent/advent.py index be4a1b8..0035946 100644 --- a/advent/advent.py +++ b/advent/advent.py @@ -104,7 +104,9 @@ def startAction(self): self.in_action = self.tvc.toggleMute() return self.in_action - def stopAction(self): + def stopAction(self, force = False): + if force: + self.exit_jingles = 1 if self.exit_jingles > 0: self.exit_jingles -= 1 if self.exit_jingles == 0: @@ -346,10 +348,10 @@ def run(self): while True: if self.tv.isInAction() and self.tv.getTimeSinceLastAction() >= MUTE_TIMEOUT_TD and self.tv.OKToAct(): print('') - if self.tv.stopAction(): - LOGGER.info('TV action ended due to timeout') - else: + if self.tv.stopAction(True): LOGGER.warning('TV action rollback on timeout failed') + else: + LOGGER.info('TV action ended due to timeout') time.sleep(1)