From 1150eee2a6d2f4877e141383dc4b992d207435ad Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 21 Oct 2017 21:46:43 +0200 Subject: [PATCH] catch all exceptions when trying to focus some area --- app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt b/app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt index 6d235b12..5d5cb49e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt @@ -364,12 +364,13 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan mCallback.drawFocusRect(mLastClickX, mLastClickY) } - mCamera!!.parameters = mParameters try { + mCamera!!.parameters = mParameters mCamera!!.autoFocus { success, camera -> if (camera == null || mCamera == null) { return@autoFocus } + camera.cancelAutoFocus() val focusModes = mParameters!!.supportedFocusModes if (focusModes.contains(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE)) @@ -383,7 +384,7 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan rescheduleAutofocus() } } - } catch (e: RuntimeException) { + } catch (e: Exception) { mActivity.showErrorToast(e) } }