Closes issue #492 : correctly restart autofocus after light is changed

zxing · Nov 6, 2015 · e449915 · e449915
1 parent d1615cc
commit e449915
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/android/src/com/google/zxing/client/android/camera/CameraManager.java b/android/src/com/google/zxing/client/android/camera/CameraManager.java
@@ -174,11 +174,14 @@ public synchronized void setTorch(boolean newSetting) {
     OpenCamera theCamera = camera;
     if (theCamera != null) {
       if (newSetting != configManager.getTorchState(theCamera.getCamera())) {
-        if (autoFocusManager != null) {
+        boolean wasAutoFocusManager = autoFocusManager != null;
+        if (wasAutoFocusManager) {
           autoFocusManager.stop();
+          autoFocusManager = null;
         }
         configManager.setTorch(theCamera.getCamera(), newSetting);
-        if (autoFocusManager != null) {
+        if (wasAutoFocusManager) {
+          autoFocusManager = new AutoFocusManager(context, theCamera.getCamera());
           autoFocusManager.start();
         }
       }