From 02f30a81ddbbfbfb62c92982e890bf129254eb05 Mon Sep 17 00:00:00 2001
From: Erik <nuclear.ace@gmail.com>
Date: Mon, 6 Jun 2016 16:25:37 -0400
Subject: [PATCH] fix test

---
 SocketIO-MacTests/SocketParserTest.swift | 2 +-
 Source/SocketEngine.swift                | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/SocketIO-MacTests/SocketParserTest.swift b/SocketIO-MacTests/SocketParserTest.swift
index c8bea5c..7307cc0 100644
--- a/SocketIO-MacTests/SocketParserTest.swift
+++ b/SocketIO-MacTests/SocketParserTest.swift
@@ -13,7 +13,7 @@ class SocketParserTest: XCTestCase {
     let testSocket = SocketIOClient(socketURL: NSURL())
     
     //Format key: message; namespace-data-binary-id
-    static let packetTypes: Dictionary<String, (String, [AnyObject], [NSData], Int)> = [
+    static let packetTypes: [String: (String, [AnyObject], [NSData], Int)] = [
         "0": ("/", [], [], -1), "1": ("/", [], [], -1),
         "25[\"test\"]": ("/", ["test"], [], 5),
         "2[\"test\",\"~~0\"]": ("/", ["test", "~~0"], [], -1),
diff --git a/Source/SocketEngine.swift b/Source/SocketEngine.swift
index 17f2b5c..92843e5 100644
--- a/Source/SocketEngine.swift
+++ b/Source/SocketEngine.swift
@@ -274,13 +274,15 @@ public final class SocketEngine : NSObject, SocketEnginePollable, SocketEngineWe
             
             ws?.disconnect()
             stopPolling()
-            client?.engineDidClose(reason)
         }
         
+        guard connected else { return postSendClose(nil, nil, nil) }
+        
         DefaultSocketLogger.Logger.log("Engine is being closed.", type: logType)
         
-        if closed || !connected {
+        if closed {
             postSendClose(nil, nil, nil)
+            client?.engineDidClose(reason)
             return
         }