Completion handlers should fire anyway.

tatey · Jul 22, 2015 · b3277bf · b3277bf
1 parent 0705986
commit b3277bf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/Source/Client.swift b/Source/Client.swift
@@ -24,12 +24,12 @@ public class Client {
 
 	public func fetch(completionHandler: ((error: NSError?) -> Void)? = nil) {
 		session.lights(selector: "all") { [weak self] (request, response, lights, error) in
-			if let strongSelf = self {
-				if error != nil {
-					completionHandler?(error: error)
-					return
-				}
+			if error != nil {
+				completionHandler?(error: error)
+				return
+			}
 
+			if let strongSelf = self {
 				let oldLights = strongSelf.lights
 				let newLights = lights
 				if oldLights != newLights {
@@ -39,8 +39,9 @@ public class Client {
 					}
 				}
 
-				completionHandler?(error: nil)
 			}
+
+			completionHandler?(error: nil)
 		}
 	}
 

diff --git a/Source/LightTarget.swift b/Source/LightTarget.swift
@@ -122,8 +122,8 @@ public class LightTarget {
 					newLights = newLights.map({ $0.lightWithPower(oldPower) })
 				}
 				strongSelf.client.updateLights(newLights)
-				completionHandler?(results: results, error: error)
 			}
+			completionHandler?(results: results, error: error)
 		}
 	}
 
@@ -148,8 +148,8 @@ public class LightTarget {
 					newLights = newLights.map({ $0.lightWithColor(oldColor, andBrightness: oldBrightness) })
 				}
 				strongSelf.client.updateLights(newLights)
-				completionHandler?(results: results, error: error)
 			}
+			completionHandler?(results: results, error: error)
 		}
 	}