Bug/nil run loop (aciidgh#41)

* currentRunLoop no long IUO * Ensure currentRunLoop is not nil before trying to remove it from streams
kervich · May 11, 2019 · 6667e19 · 6667e19
1 parent e412d41
commit 6667e19
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/SwiftMQTT/SwiftMQTT/MQTTSessionStream.swift b/SwiftMQTT/SwiftMQTT/MQTTSessionStream.swift
@@ -16,7 +16,7 @@ protocol MQTTSessionStreamDelegate: class {
 
 class MQTTSessionStream: NSObject {
 
-    private var currentRunLoop: RunLoop!
+    private var currentRunLoop: RunLoop?
     private let inputStream: InputStream?
     private let outputStream: OutputStream?
     private var sessionQueue: DispatchQueue
@@ -48,8 +48,8 @@ class MQTTSessionStream: NSObject {
             }
 
             self.currentRunLoop = RunLoop.current
-            inputStream?.schedule(in: self.currentRunLoop, forMode: .defaultRunLoopMode)
-            outputStream?.schedule(in: self.currentRunLoop, forMode: .defaultRunLoopMode)
+            inputStream?.schedule(in: self.currentRunLoop!, forMode: .defaultRunLoopMode)
+            outputStream?.schedule(in: self.currentRunLoop!, forMode: .defaultRunLoopMode)
 
             inputStream?.open()
             outputStream?.open()
@@ -63,12 +63,13 @@ class MQTTSessionStream: NSObject {
                     self.connectTimeout()
                 }
             }
-            self.currentRunLoop.run()
+            self.currentRunLoop!.run()
         }
     }
 
     deinit {
         delegate = nil
+        guard let currentRunLoop = currentRunLoop else { return }
         inputStream?.close()
         inputStream?.remove(from: currentRunLoop, forMode: .defaultRunLoopMode)
         outputStream?.close()