Merge branch 'master' into development

* master:
  Fix crash if error contains formatting strings.
This commit is contained in:
Erik 2016-05-25 08:20:03 -04:00
commit ff48d3a186

View File

@ -261,7 +261,7 @@ public final class SocketEngine : NSObject, SocketEnginePollable, SocketEngineWe
} }
public func didError(error: String) { public func didError(error: String) {
DefaultSocketLogger.Logger.error(error, type: logType) DefaultSocketLogger.Logger.error("%@", type: logType, args: error)
client?.engineDidError(error) client?.engineDidError(error)
disconnect(error) disconnect(error)
} }