Merge branch 'master' of github.com:XKNX/xknx

XKNX · Feb 5, 2018 · ce008e9 · ce008e9
2 parents b4daea4 + 58e23af
commit ce008e9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/home-assistant-plugin/custom_components/light/xknx.py b/home-assistant-plugin/custom_components/light/xknx.py
@@ -171,7 +171,7 @@ def async_turn_on(self, **kwargs):
         """Turn the light on."""
         if ATTR_BRIGHTNESS in kwargs and self.device.supports_dimming:
             yield from self.device.set_brightness(int(kwargs[ATTR_BRIGHTNESS]))
-        if ATTR_RGB_COLOR in kwargs:
+        elif ATTR_RGB_COLOR in kwargs:
             yield from self.device.set_color(kwargs[ATTR_RGB_COLOR])
         else:
             yield from self.device.set_on()