Merge pull request dm77#3 from tmay/master

Fix for an Auto Focus exception
mcklayin · Nov 29, 2012 · 01ddcc0 · 01ddcc0
2 parents 2ee9175 + 8518e8c
commit 01ddcc0
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/ZBarScannerLibrary/src/com/dm/zbar/android/scanner/ZBarScannerActivity.java b/ZBarScannerLibrary/src/com/dm/zbar/android/scanner/ZBarScannerActivity.java
@@ -21,7 +21,8 @@ public class ZBarScannerActivity extends Activity implements Camera.PreviewCallb
     private Camera mCamera;
     private ImageScanner mScanner;
     private Handler mAutoFocusHandler;
-
+    private boolean complete;
+
     static {
         System.loadLibrary("iconv");
     }
@@ -97,7 +98,7 @@ public void onPreviewFrame(byte[] data, Camera camera) {
             mCamera.cancelAutoFocus();
             mCamera.setPreviewCallback(null);
             mCamera.stopPreview();
-
+            complete = true;
             SymbolSet syms = mScanner.getResults();
             for (Symbol sym : syms) {
                 String symData = sym.getData();
@@ -114,7 +115,7 @@ public void onPreviewFrame(byte[] data, Camera camera) {
     }
     private Runnable doAutoFocus = new Runnable() {
         public void run() {
-            if(mCamera != null) {
+            if(mCamera != null && !complete) {
                 mCamera.autoFocus(autoFocusCB);
             }
         }