From d9523a0cbf556c3483d546ce42da808345af01f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20S=C3=A1rk=C3=B6zi?= <xmisterhu@gmail.com>
Date: Fri, 8 Sep 2023 23:10:20 +0200
Subject: [PATCH] Fix repeat.count = 0 case (#5364)

* Only play first action if count is non-zero

* Add test to  yaml

* Update test5.yaml
---
 esphome/core/base_automation.h | 6 +++++-
 tests/test5.yaml               | 7 +++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/esphome/core/base_automation.h b/esphome/core/base_automation.h
index daa09b912e..a17b6a6f85 100644
--- a/esphome/core/base_automation.h
+++ b/esphome/core/base_automation.h
@@ -249,7 +249,11 @@ template<typename... Ts> class RepeatAction : public Action<Ts...> {
   void play_complex(Ts... x) override {
     this->num_running_++;
     this->var_ = std::make_tuple(x...);
-    this->then_.play(0, x...);
+    if (this->count_.value(x...) > 0) {
+      this->then_.play(0, x...);
+    } else {
+      this->play_next_tuple_(this->var_);
+    }
   }
 
   void play(Ts... x) override { /* ignore - see play_complex */
diff --git a/tests/test5.yaml b/tests/test5.yaml
index a1cc3103d7..417f3bfecd 100644
--- a/tests/test5.yaml
+++ b/tests/test5.yaml
@@ -563,6 +563,13 @@ script:
           then:
             - logger.log: looping!
 
+  - id: zero_repeat_test
+    then:
+      - repeat:
+          count: !lambda "return 0;"
+          then:
+            - logger.log: shouldn't see mee!
+
 switch:
   - platform: modbus_controller
     modbus_controller_id: modbus_controller_test