Merge pull request juliansteenbakker#781 from navaronbracke/fix_issue…

…_720 fix: Guard against a nil device in the background queue
joaopedro735 · Oct 13, 2023 · aeb2154 · aeb2154
2 parents 9232d16 + fcbb735
commit aeb2154
Showing 1 changed file with 21 additions and 11 deletions.
diff --git a/ios/Classes/MobileScanner.swift b/ios/Classes/MobileScanner.swift
@@ -213,18 +213,28 @@ public class MobileScanner: NSObject, AVCaptureVideoDataOutputSampleBufferDelega
             } catch {
                 print("Failed to reset zoom scale")
             }
-
-            let dimensions = CMVideoFormatDescriptionGetDimensions(self.device.activeFormat.formatDescription)
-
-            DispatchQueue.main.async {
-                completion(
-                    MobileScannerStartParameters(
-                        width: Double(dimensions.height),
-                        height: Double(dimensions.width),
-                        hasTorch: self.device.hasTorch,
-                        textureId: self.textureId
+
+            if let device = self.device {
+                let dimensions = CMVideoFormatDescriptionGetDimensions(
+                    device.activeFormat.formatDescription)
+                let hasTorch = device.hasTorch
+
+                DispatchQueue.main.async {
+                    completion(
+                        MobileScannerStartParameters(
+                            width: Double(dimensions.height),
+                            height: Double(dimensions.width),
+                            hasTorch: hasTorch,
+                            textureId: self.textureId ?? 0
+                        )
                     )
-                )
+                }
+
+                return
+            }
+
+            DispatchQueue.main.async {
+                completion(MobileScannerStartParameters())
             }
         }
     }