From 716cee69074aa391d61d3cda487b50872bc87346 Mon Sep 17 00:00:00 2001 From: Phil Bruckner Date: Thu, 16 Jul 2020 14:03:43 -0500 Subject: [PATCH] Fix automation & script restart mode bug (#37909) --- homeassistant/helpers/script.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/homeassistant/helpers/script.py b/homeassistant/helpers/script.py index 29d1acf0316..1ca13e22e9f 100644 --- a/homeassistant/helpers/script.py +++ b/homeassistant/helpers/script.py @@ -760,14 +760,16 @@ class Script: raise async def _async_stop(self, update_state): - await asyncio.wait([run.async_stop() for run in self._runs]) + aws = [run.async_stop() for run in self._runs] + if not aws: + return + await asyncio.wait(aws) if update_state: self._changed() async def async_stop(self, update_state: bool = True) -> None: """Stop running script.""" - if self.is_running: - await asyncio.shield(self._async_stop(update_state)) + await asyncio.shield(self._async_stop(update_state)) async def _async_get_condition(self, config): config_cache_key = frozenset((k, str(v)) for k, v in config.items())