From fee51d604dad28897d0b255e2b4d6346df59639d Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Tue, 30 Dec 2014 18:36:55 -0800 Subject: [PATCH] demo comp: preserve color when turning on light that's on --- homeassistant/components/demo.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/demo.py b/homeassistant/components/demo.py index 002a5b1a482..2bddaf4065d 100644 --- a/homeassistant/components/demo.py +++ b/homeassistant/components/demo.py @@ -50,12 +50,19 @@ def setup(hass, config): if domain == "light": rgb_color = service.data.get(ATTR_RGB_COLOR) - if rgb_color is None: - color = random.choice(light_colors) - else: + if rgb_color: color = color_RGB_to_xy( rgb_color[0], rgb_color[1], rgb_color[2]) + else: + cur_state = hass.states.get(entity_id) + + # Use current color if available + if cur_state and cur_state.attributes.get(ATTR_XY_COLOR): + color = cur_state.attributes.get(ATTR_XY_COLOR) + else: + color = random.choice(light_colors) + data = { ATTR_BRIGHTNESS: service.data.get(ATTR_BRIGHTNESS, 200), ATTR_XY_COLOR: color