From 7bb524810d97c414994dd1de1cfc49ebdbf199ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 5 Jul 2020 01:33:27 +0200 Subject: [PATCH] Check that we actually got a preview size. --- android/src/org/ppsspp/ppsspp/CameraHelper.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/android/src/org/ppsspp/ppsspp/CameraHelper.java b/android/src/org/ppsspp/ppsspp/CameraHelper.java index f4b712d72f..642504f038 100644 --- a/android/src/org/ppsspp/ppsspp/CameraHelper.java +++ b/android/src/org/ppsspp/ppsspp/CameraHelper.java @@ -218,6 +218,10 @@ class CameraHelper { } } + if (mPreviewSize == null) { + throw new Exception("Couldn't find a viable preview size"); + } + Log.d(TAG, "setPreviewSize(" + mPreviewSize.width + ", " + mPreviewSize.height + ")"); param.setPreviewSize(mPreviewSize.width, mPreviewSize.height); @@ -239,7 +243,7 @@ class CameraHelper { mCamera.setPreviewCallback(mPreviewCallback); mCamera.startPreview(); mIsCameraRunning = true; - } catch (IOException e) { + } catch (Exception e) { Log.e(TAG, "Cannot start camera: " + e.toString()); } }