From 8e5831d498ab13307c63d5183d9cefb088f7dfcc Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Wed, 27 Sep 2017 18:21:30 +0200 Subject: [PATCH] Dont act on Camera if it is in the middle of a stop --- .../src/main/java/com/otaliastudios/cameraview/Camera1.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java b/cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java index 9cf02e59..44741130 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java @@ -192,7 +192,7 @@ class Camera1 extends CameraController { Exception error = null; LOG.i("onStop:", "About to clean up."); mHandler.get().removeCallbacks(mPostFocusResetRunnable); - if (isCameraAvailable()) { + if (mCamera != null) { LOG.i("onStop:", "Clean up.", "Ending video?", mIsCapturingVideo); if (mIsCapturingVideo) endVideo(); @@ -511,7 +511,9 @@ class Camera1 extends CameraController { } private boolean isCameraAvailable() { - return mCamera != null; + // Don't do if state is stopping. The camera instance might have been released, + // even if onStop did not return yet. + return mCamera != null && mState > STATE_STOPPING; }