From 4b91cfb7f90f3d34de63428a1df08c30f09ab7a5 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 11 Jun 2021 23:28:00 +1200
Subject: [PATCH] Ensure wifi is in at least station mode before starting
 improv (#1899)

---
 esphome/components/wifi/wifi_component.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/esphome/components/wifi/wifi_component.cpp b/esphome/components/wifi/wifi_component.cpp
index de7ffb4f09..e98754fac7 100644
--- a/esphome/components/wifi/wifi_component.cpp
+++ b/esphome/components/wifi/wifi_component.cpp
@@ -79,7 +79,8 @@ void WiFiComponent::setup() {
   }
 #ifdef USE_IMPROV
   if (esp32_improv::global_improv_component != nullptr)
-    esp32_improv::global_improv_component->start();
+    if (this->wifi_mode_(true, {}))
+      esp32_improv::global_improv_component->start();
 #endif
   this->wifi_apply_hostname_();
 #if defined(ARDUINO_ARCH_ESP32) && defined(USE_MDNS)
@@ -143,11 +144,11 @@ void WiFiComponent::loop() {
     }
 
 #ifdef USE_IMPROV
-    if (esp32_improv::global_improv_component != nullptr) {
-      if (!this->is_connected()) {
-        esp32_improv::global_improv_component->start();
-      }
-    }
+    if (esp32_improv::global_improv_component != nullptr)
+      if (!this->is_connected())
+        if (this->wifi_mode_(true, {}))
+          esp32_improv::global_improv_component->start();
+
 #endif
 
     if (!this->has_ap() && this->reboot_timeout_ != 0) {