From 4f29adfd7b6dcc9bf99e4d5b9014254b8711ff2a Mon Sep 17 00:00:00 2001 From: Ulric De Gasperin Date: Thu, 16 Jan 2025 16:23:28 +0100 Subject: [PATCH] [CameraView] Android - Fix SetSurfaceProvider crash See https://github.com/CommunityToolkit/Maui/issues/2438 --- src/CommunityToolkit.Maui.Camera/CameraManager.android.cs | 4 ++-- .../CommunityToolkit.Maui.Camera.csproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs index 23cfdd4c63..f3a23aa830 100644 --- a/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs +++ b/src/CommunityToolkit.Maui.Camera/CameraManager.android.cs @@ -172,7 +172,7 @@ protected virtual async partial Task PlatformConnectCamera(CancellationToken tok protected async Task StartUseCase(CancellationToken token) { - if (resolutionSelector is null) + if (resolutionSelector is null || cameraExecutor is null) { return; } @@ -183,7 +183,7 @@ protected async Task StartUseCase(CancellationToken token) imageCapture?.Dispose(); cameraPreview = new Preview.Builder().SetResolutionSelector(resolutionSelector).Build(); - cameraPreview.SetSurfaceProvider(previewView?.SurfaceProvider); + cameraPreview.SetSurfaceProvider(cameraExecutor, previewView?.SurfaceProvider); imageCapture = new ImageCapture.Builder() .SetCaptureMode(ImageCapture.CaptureModeMaximizeQuality) diff --git a/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj b/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj index abb23f8555..e21362b7d6 100644 --- a/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj +++ b/src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj @@ -51,8 +51,8 @@ - - + +