Merge pull request #193 from bstadick/bugfix-null-view-exception

Bugfix null view exception
Redth · Sep 12, 2024 · e753ee4 · e753ee4
2 parents ea0f293 + 43d71e1
commit e753ee4
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 13 deletions.
diff --git a/ZXing.Net.MAUI/CameraBarcodeReaderViewHandler.cs b/ZXing.Net.MAUI/CameraBarcodeReaderViewHandler.cs
@@ -51,17 +51,23 @@ protected override async void ConnectHandler(NativePlatformCameraPreviewView nat
         {
             base.ConnectHandler(nativeView);
 
-            if (await cameraManager.CheckPermissions())
-                cameraManager.Connect();
+            if (cameraManager != null)
+            {
+                if (await cameraManager.CheckPermissions())
+                    cameraManager.Connect();
 
-            cameraManager.FrameReady += CameraManager_FrameReady;
+                cameraManager.FrameReady += CameraManager_FrameReady;
+            }
         }
 
         protected override void DisconnectHandler(NativePlatformCameraPreviewView nativeView)
         {
-            cameraManager.FrameReady -= CameraManager_FrameReady;
+            if (cameraManager != null)
+            {
+                cameraManager.FrameReady -= CameraManager_FrameReady;
 
-            cameraManager.Disconnect();
+                cameraManager.Disconnect();
+            }
 
             base.DisconnectHandler(nativeView);
         }
@@ -70,7 +76,7 @@ private void CameraManager_FrameReady(object sender, CameraFrameBufferEventArgs
         {
             VirtualView?.FrameReady(e);
 
-            if (VirtualView.IsDetecting)
+            if (VirtualView?.IsDetecting ?? false)
             {
                 var barcodes = BarcodeReader.Decode(e.Data);
 

diff --git a/ZXing.Net.MAUI/CameraViewHandler.cs b/ZXing.Net.MAUI/CameraViewHandler.cs
@@ -44,21 +44,27 @@ protected override NativePlatformCameraPreviewView CreatePlatformView()
 		protected override async void ConnectHandler(NativePlatformCameraPreviewView nativeView)
 		{
 			base.ConnectHandler(nativeView);
-
-			if (await cameraManager.CheckPermissions())
-				cameraManager.Connect();
-
-			cameraManager.FrameReady += CameraManager_FrameReady;
+
+			if (cameraManager != null)
+			{
+				if (await cameraManager.CheckPermissions())
+					cameraManager.Connect();
+
+				cameraManager.FrameReady += CameraManager_FrameReady;
+			}
 		}
 
 		void CameraManager_FrameReady(object sender, CameraFrameBufferEventArgs e)
 			=> VirtualView?.FrameReady(e);
 
         protected override void DisconnectHandler(NativePlatformCameraPreviewView nativeView)
 		{
-			cameraManager.FrameReady -= CameraManager_FrameReady;
+			if (cameraManager != null)
+			{
+				cameraManager.FrameReady -= CameraManager_FrameReady;
 
-			cameraManager.Disconnect();
+				cameraManager.Disconnect();
+			}
 
 			base.DisconnectHandler(nativeView);
 		}