diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs index 8b105f9fec..c2f8e299b0 100644 --- a/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs +++ b/src/CommunityToolkit.Maui.Camera/CameraManager.macios.cs @@ -106,12 +106,7 @@ public partial void UpdateZoom(float zoomLevel) public partial ValueTask UpdateCaptureResolution(Size resolution, CancellationToken token) { - if (cameraView.SelectedCamera is null) - { - throw new CameraException($"Unable to update Capture Resolution because {nameof(ICameraView)}.{nameof(ICameraView.SelectedCamera)} is null."); - } - - if (captureDevice is null) + if (cameraView.SelectedCamera is null || captureDevice is null) { return ValueTask.CompletedTask; } diff --git a/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs b/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs index b4d692093a..5b211ea31e 100644 --- a/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs +++ b/src/CommunityToolkit.Maui.Camera/CameraManager.windows.cs @@ -157,16 +157,11 @@ private partial void PlatformStopCameraPreview() async Task PlatformUpdateResolution(Size resolution, CancellationToken token) { - if (!IsInitialized || mediaCapture is null) + if (cameraView.SelectedCamera is null || !IsInitialized || mediaCapture is null) { return; } - if (cameraView.SelectedCamera is null) - { - throw new CameraException($"Unable to update Capture Resolution because {nameof(ICameraView)}.{nameof(ICameraView.SelectedCamera)} is null."); - } - var filteredPropertiesList = cameraView.SelectedCamera.ImageEncodingProperties.Where(p => p.Width <= resolution.Width && p.Height <= resolution.Height).ToList(); if (filteredPropertiesList.Count is 0) diff --git a/src/CommunityToolkit.Maui.Camera/Handlers/CameraViewHandler.shared.cs b/src/CommunityToolkit.Maui.Camera/Handlers/CameraViewHandler.shared.cs index 166c8c4406..a8e76ca734 100644 --- a/src/CommunityToolkit.Maui.Camera/Handlers/CameraViewHandler.shared.cs +++ b/src/CommunityToolkit.Maui.Camera/Handlers/CameraViewHandler.shared.cs @@ -107,8 +107,6 @@ protected virtual void Dispose(bool disposing) { cameraManager?.Dispose(); cameraManager = null; - - cameraProvider.Dispose(); } }