fix last commit about setFacing

pull/59/head
Tim H 8 years ago
parent 4d38984822
commit a067fc2702
  1. 12
      cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java

@ -338,17 +338,19 @@ class Camera1 extends CameraController {
void setFacing(Facing facing) { void setFacing(Facing facing) {
if (facing != mFacing) { if (facing != mFacing) {
// call these methods before actually changing the attribute's value, because Facing oldFacing = mFacing;
// collectCameraId may raise an exception that prevents us from changing anything here
try { try {
boolean restart = collectCameraId() && isCameraAvailable(); // this value must be set before calling collectCameraId()
mFacing = facing; mFacing = facing;
if (restart) {
if (collectCameraId() && isCameraAvailable()) {
restart(); restart();
} }
} }
catch (Exception e) { catch (Exception e) {
// collectCameraId may raise an exception that prevents us from changing anything here
// -> undo failed configuration change
mFacing = oldFacing;
CameraException cameraException = CameraException cameraException =
new CameraConfigurationFailedException("Failed to set the camera facing.", e); new CameraConfigurationFailedException("Failed to set the camera facing.", e);
mCameraCallbacks.onError(cameraException); mCameraCallbacks.onError(cameraException);

Loading…
Cancel
Save