From eb9d2bc74442551bee1b270635d428792824f2a3 Mon Sep 17 00:00:00 2001 From: Erik Date: Mon, 6 Apr 2015 12:59:39 -0400 Subject: [PATCH] better closing --- SwiftIO/SocketEngine.swift | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/SwiftIO/SocketEngine.swift b/SwiftIO/SocketEngine.swift index ff0beac..3b93fe8 100644 --- a/SwiftIO/SocketEngine.swift +++ b/SwiftIO/SocketEngine.swift @@ -104,8 +104,6 @@ public class SocketEngine: NSObject, WebSocketDelegate { if fast || self.polling { self.client?.didForceClose("Disconnect") } - - self.client = nil } private func createBinaryDataForSend(data:NSData) -> (NSData?, String?) { @@ -658,6 +656,11 @@ public class SocketEngine: NSObject, WebSocketDelegate { self.websocketConnected = false self.probing = false + if self.closed { + self.client?.didForceClose("Disconnect") + return + } + if self.websocket { self.pingTimer?.invalidate() self._connected = false