From 0231255d3eaf9c2cdcbcadb29fbee1767cbed32d Mon Sep 17 00:00:00 2001
From: Ben Sagal <bsagal@gmail.com>
Date: Mon, 27 Mar 2017 11:40:16 +0300
Subject: [PATCH] Fix Exception for calling stop in onPictureTaken Callback
 Fixes bug #67

---
 .../src/main/api14/com/google/android/cameraview/Camera1.java    | 1 +
 .../src/main/api21/com/google/android/cameraview/Camera2.java    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/library/src/main/api14/com/google/android/cameraview/Camera1.java b/library/src/main/api14/com/google/android/cameraview/Camera1.java
index 0f92ac50..fe65a097 100644
--- a/library/src/main/api14/com/google/android/cameraview/Camera1.java
+++ b/library/src/main/api14/com/google/android/cameraview/Camera1.java
@@ -243,6 +243,7 @@ void takePictureInternal() {
                 public void onPictureTaken(byte[] data, Camera camera) {
                     isPictureCaptureInProgress.set(false);
                     mCallback.onPictureTaken(data);
+                    if (!isCameraOpened()) return;
                     camera.cancelAutoFocus();
                     camera.startPreview();
                 }
diff --git a/library/src/main/api21/com/google/android/cameraview/Camera2.java b/library/src/main/api21/com/google/android/cameraview/Camera2.java
index 4835f89e..e4c01b92 100644
--- a/library/src/main/api21/com/google/android/cameraview/Camera2.java
+++ b/library/src/main/api21/com/google/android/cameraview/Camera2.java
@@ -655,6 +655,7 @@ public void onCaptureCompleted(@NonNull CameraCaptureSession session,
      * capturing a still picture.
      */
     void unlockFocus() {
+        if (!isCameraOpened()) return;
         mPreviewRequestBuilder.set(CaptureRequest.CONTROL_AF_TRIGGER,
                 CaptureRequest.CONTROL_AF_TRIGGER_CANCEL);
         try {