Merge pull request #78 from EssentialNRG/hotfix/null-ref-barcodeview

Update LayoutSubviews BarcodeView to prevent NullReferenceException
afriscic · Jul 8, 2024 · d7c4ad7 · d7c4ad7
2 parents e0b980f + af5c1e0
commit d7c4ad7
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/BarcodeScanning.Native.Maui/Platform/MaciOS/BarcodeView.cs b/BarcodeScanning.Native.Maui/Platform/MaciOS/BarcodeView.cs
@@ -20,13 +20,20 @@ public override void LayoutSubviews()
     {
         base.LayoutSubviews();
 
+        var layer = this.Layer;
+        var window = this.Window;
+        if (window is null || layer is null) {
+            return;
+        }
+
         if (_previewLayer is not null)
-            _previewLayer.Frame =  this.Layer.Bounds;
+            _previewLayer.Frame =  layer.Bounds;
         if (_shapeLayer is not null)
-            _shapeLayer.Position = new CGPoint(this.Layer.Bounds.Width / 2, this.Layer.Bounds.Height / 2);
+            _shapeLayer.Position = new CGPoint(layer.Bounds.Width / 2, layer.Bounds.Height / 2);
 
-        if (_previewLayer?.Connection is not null && _previewLayer.Connection.SupportsVideoOrientation)
-            _previewLayer.Connection.VideoOrientation = this.Window.WindowScene?.InterfaceOrientation switch
+        var previewLayerConnection = _previewLayer?.Connection;
+        if (previewLayerConnection is not null && previewLayerConnection.SupportsVideoOrientation)
+            previewLayerConnection.VideoOrientation = window.WindowScene?.InterfaceOrientation switch
             {
                 UIInterfaceOrientation.LandscapeLeft => AVCaptureVideoOrientation.LandscapeLeft,
                 UIInterfaceOrientation.LandscapeRight => AVCaptureVideoOrientation.LandscapeRight,