Merge pull request #317 from jtjacka/master

fix timeoutAfter handler always close connection
socketio · Feb 26, 2016 · 11c0ac2 · 11c0ac2
2 parents 2f4c942 + 1e96d79
commit 11c0ac2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Source/SocketIOClient.swift b/Source/SocketIOClient.swift
@@ -169,7 +169,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketParsable
         let time = dispatch_time(DISPATCH_TIME_NOW, Int64(timeoutAfter) * Int64(NSEC_PER_SEC))
 
         dispatch_after(time, handleQueue) {[weak self] in
-            if let this = self where this.status != .Connected || this.status != .Closed {
+            if let this = self where this.status != .Connected && this.status != .Closed {
                 this.status = .Closed
                 this.engine?.disconnect("Connect timeout")