From 1e7a4af4daae473e93512f4396b5073c359b9768 Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Sat, 23 Feb 2019 14:30:43 +0100 Subject: [PATCH] Fix #384 --- .../java/com/otaliastudios/cameraview/CameraController.java | 2 +- .../main/java/com/otaliastudios/cameraview/CameraView.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraController.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraController.java index d6063787..cfedbb9c 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraController.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraController.java @@ -91,7 +91,7 @@ abstract class CameraController implements mFrameManager = new FrameManager(2, this); } - void setPreview(CameraPreview cameraPreview) { + void setPreview(@NonNull CameraPreview cameraPreview) { mPreview = cameraPreview; mPreview.setSurfaceCallback(this); } diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java index f7c979ff..ca420c41 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java @@ -601,8 +601,8 @@ public class CameraView extends FrameLayout implements LifecycleObserver { @OnLifecycleEvent(Lifecycle.Event.ON_RESUME) public void open() { if (!isEnabled()) return; - if (mCameraPreview != null) mCameraPreview.onResume(); - + if (mCameraPreview == null) return; // Don't want to start without a preview + mCameraPreview.onResume(); if (checkPermissions(getAudio())) { // Update display orientation for current CameraController mOrientationHelper.enable(getContext());