- Fixes #44, error in processing state value if the id is in error

peter-murray · Feb 4, 2015 · c479b8b · c479b8b
1 parent 3388705
commit c479b8b
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/hue-api/index.js b/hue-api/index.js
@@ -991,23 +991,24 @@ HueApi.prototype._getLightStateOptions = function (lightId, stateValues) {
         } else {
             state = lightState.create(stateValues);
         }
-    }
 
-    if (state.hasRGB()) {
-        promise = self.lightStatus(lightId)
-            .then(function (lightDetails) {
-                state = state.applyRGB(lightDetails.modelid);
-                options.values = state.payload();
+        if (state.hasRGB()) {
+            promise = self.lightStatus(lightId)
+                .then(function (lightDetails) {
+                    state = state.applyRGB(lightDetails.modelid);
+                    options.values = state.payload();
 
-                return options;
-            });
-    } else {
-        options.values = state.payload();
+                    return options;
+                });
+        } else {
+            options.values = state.payload();
+
+            deferred = Q.defer();
+            deferred.resolve(options);
 
-        deferred = Q.defer();
-        deferred.resolve(options);
+            promise = deferred.promise;
+        }
 
-        promise = deferred.promise;
     }
 
     return promise;