Merge fb653a4 into baa4945

home-assistant · Mar 26, 2019 · a36dd29 · a36dd29
2 parents baa4945 + fb653a4
commit a36dd29
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/homeassistant/components/yeelight/__init__.py b/homeassistant/components/yeelight/__init__.py
@@ -259,8 +259,6 @@ def turn_on(self, duration=DEFAULT_TRANSITION):
             _LOGGER.error("Unable to turn the bulb on: %s", ex)
             return
 
-        self.update()
-
     def turn_off(self, duration=DEFAULT_TRANSITION):
         """Turn off device."""
         import yeelight
@@ -271,8 +269,6 @@ def turn_off(self, duration=DEFAULT_TRANSITION):
             _LOGGER.error("Unable to turn the bulb on: %s", ex)
             return
 
-        self.update()
-
     def update(self):
         """Read new properties from the device."""
         if not self.bulb:

diff --git a/homeassistant/components/yeelight/light.py b/homeassistant/components/yeelight/light.py
@@ -494,6 +494,7 @@ def turn_on(self, **kwargs) -> None:
             except yeelight.BulbException as ex:
                 _LOGGER.error("Unable to set the defaults: %s", ex)
                 return
+        self.device.update()
 
     def turn_off(self, **kwargs) -> None:
         """Turn off."""
@@ -502,18 +503,18 @@ def turn_off(self, **kwargs) -> None:
             duration = int(kwargs.get(ATTR_TRANSITION) * 1000)  # kwarg in s
 
         self.device.turn_off(duration=duration)
+        self.device.update()
 
     def set_mode(self, mode: str):
         """Set a power mode."""
         import yeelight
 
         try:
             self._bulb.set_power_mode(yeelight.enums.PowerMode[mode.upper()])
+            self.device.update()
         except yeelight.BulbException as ex:
             _LOGGER.error("Unable to set the power mode: %s", ex)
 
-        self.device.update()
-
     def start_flow(self, transitions, count=0, action=ACTION_RECOVER):
         """Start flow."""
         import yeelight