Don't use dispatch_sync if already in the main thread (#797)

phonegap · Jun 25, 2019 · d45ffc3 · d45ffc3
1 parent bb4e66c
commit d45ffc3
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/ios/CDVBarcodeScanner.mm b/src/ios/CDVBarcodeScanner.mm
@@ -428,11 +428,16 @@ - (void)barcodeScanSucceeded:(NSString*)text format:(NSString*)format {
 
 //--------------------------------------------------------------------------
 - (void)barcodeScanFailed:(NSString*)message {
-    dispatch_sync(dispatch_get_main_queue(), ^{
+    dispatch_block_t block = ^{
         [self barcodeScanDone:^{
             [self.plugin returnError:message callback:self.callback];
         }];
-    });
+    };
+    if ([NSThread isMainThread]) {
+        block();
+    } else {
+        dispatch_sync(dispatch_get_main_queue(), block);
+    }
 }
 
 //--------------------------------------------------------------------------