Dev

yuriy-budiyev · Sep 22, 2017 · a3c813f · a3c813f
1 parent de49c39
commit a3c813f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/src/main/java/com/budiyev/android/codescanner/CodeScanner.java b/src/main/java/com/budiyev/android/codescanner/CodeScanner.java
@@ -280,15 +280,7 @@ public void releaseResources() {
             if (mPreviewActive) {
                 stopPreview();
             }
-            mInitialized = false;
-            mInitialization = false;
-            mStoppingPreview = false;
-            mPreviewActive = false;
-            mFocusing = false;
-            DecoderWrapper decoderWrapper = mDecoderWrapper;
-            decoderWrapper.getCamera().release();
-            decoderWrapper.getDecoder().shutdown();
-            mDecoderWrapper = null;
+            releaseResourcesInternal();
         }
     }
 
@@ -356,6 +348,19 @@ private void stopPreviewInternalSafe() {
         }
     }
 
+    private void releaseResourcesInternal() {
+        mInitialized = false;
+        mInitialization = false;
+        mStoppingPreview = false;
+        mPreviewActive = false;
+        mFocusing = false;
+        DecoderWrapper decoderWrapper = mDecoderWrapper;
+        if (decoderWrapper != null) {
+            mDecoderWrapper = null;
+            decoderWrapper.release();
+        }
+    }
+
     private void setFlashEnabledInternal(boolean flashEnabled) {
         try {
             DecoderWrapper decoderWrapper = mDecoderWrapper;
@@ -519,6 +524,7 @@ public void run() {
             try {
                 initialize();
             } catch (Exception e) {
+                releaseResourcesInternal();
                 ErrorCallback errorCallback = mErrorCallback;
                 if (errorCallback != null) {
                     errorCallback.onError(e);

diff --git a/src/main/java/com/budiyev/android/codescanner/DecoderWrapper.java b/src/main/java/com/budiyev/android/codescanner/DecoderWrapper.java
@@ -86,4 +86,9 @@ public boolean isAutoFocusSupported() {
     public boolean isFlashSupported() {
         return mFlashSupported;
     }
+
+    public void release() {
+        mCamera.release();
+        mDecoder.shutdown();
+    }
 }