From 4024c70f30aebec855ff99ba5b935ec4063a7b5a Mon Sep 17 00:00:00 2001
From: Lucas Nogueira <lucas@tauri.app>
Date: Thu, 22 Jun 2023 13:45:31 -0300
Subject: [PATCH] fix race condition

---
 .../ios/Sources/BarcodeScannerPlugin.swift    | 42 +++++++------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/plugins/barcode-scanner/ios/Sources/BarcodeScannerPlugin.swift b/plugins/barcode-scanner/ios/Sources/BarcodeScannerPlugin.swift
index cc190c21..21a71325 100644
--- a/plugins/barcode-scanner/ios/Sources/BarcodeScannerPlugin.swift
+++ b/plugins/barcode-scanner/ios/Sources/BarcodeScannerPlugin.swift
@@ -157,16 +157,14 @@ class BarcodeScannerPlugin: Plugin, AVCaptureMetadataOutputObjectsDelegate {
   }
 
   private func dismantleCamera() {
-    DispatchQueue.main.async {
-      if self.captureSession != nil {
-        self.captureSession!.stopRunning()
-        self.cameraView.removePreviewLayer()
-        self.captureVideoPreviewLayer = nil
-        self.metaOutput = nil
-        self.captureSession = nil
-        self.frontCamera = nil
-        self.backCamera = nil
-      }
+    if self.captureSession != nil {
+      self.captureSession!.stopRunning()
+      self.cameraView.removePreviewLayer()
+      self.captureVideoPreviewLayer = nil
+      self.metaOutput = nil
+      self.captureSession = nil
+      self.frontCamera = nil
+      self.backCamera = nil
     }
 
     self.isScanning = false
@@ -183,15 +181,6 @@ class BarcodeScannerPlugin: Plugin, AVCaptureMetadataOutputObjectsDelegate {
     }
   }
 
-  private func prepare(_ direction: String, _ windowed: Bool) {
-    dismantleCamera()
-
-    DispatchQueue.main.async { [self] in
-      // setup camera with new config
-      self.setupCamera(direction: direction, windowed: windowed)
-    }
-  }
-
   private func getPermissionState() -> String {
     var permissionState: String
 
@@ -260,10 +249,8 @@ class BarcodeScannerPlugin: Plugin, AVCaptureMetadataOutputObjectsDelegate {
       }
     }
 
-    DispatchQueue.main.async {
-      self.metaOutput!.metadataObjectTypes = self.scanFormats
-      self.captureSession!.startRunning()
-    }
+    self.metaOutput!.metadataObjectTypes = self.scanFormats
+    self.captureSession!.startRunning()
 
     self.isScanning = true
   }
@@ -284,10 +271,13 @@ class BarcodeScannerPlugin: Plugin, AVCaptureMetadataOutputObjectsDelegate {
       }
     }
 
-    DispatchQueue.main.async {
+    DispatchQueue.main.async { [self] in
       self.loadCamera()
-      self.prepare(
-        invoke.getString("cameraDirection") ?? "back", invoke.getBool("windowed") ?? false)
+      self.dismantleCamera()
+      self.setupCamera(
+        direction: invoke.getString("cameraDirection") ?? "back",
+        windowed: invoke.getBool("windowed") ?? false
+      )
       self.runScanner(invoke)
     }
   }