Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f7d8ae7 authored by Mark Harman's avatar Mark Harman
Browse files

Fix crash if camera is null in initVideoRecorderPostPrepare.

parent 728a96d2

app/src/main/java/net/sourceforge/opencamera/CameraController/CameraController2.java

+5 −1
Original line number Diff line number Diff line
@@ -4955,12 +4955,16 @@ public class CameraController2 extends CameraController { 
	public void initVideoRecorderPostPrepare(MediaRecorder video_recorder) throws CameraControllerException {

		if( MyDebug.LOG )

			Log.d(TAG, "initVideoRecorderPostPrepare");

		if( camera == null ) {

			Log.e(TAG, "no camera");

			throw new CameraControllerException();

		}

		try {

			if( MyDebug.LOG )

				Log.d(TAG, "obtain video_recorder surface");

			previewBuilder = camera.createCaptureRequest(CameraDevice.TEMPLATE_RECORD);

			if( MyDebug.LOG )

				Log.d(TAG, "done");

			previewBuilder = camera.createCaptureRequest(CameraDevice.TEMPLATE_RECORD);

			previewIsVideoMode = true;

			previewBuilder.set(CaptureRequest.CONTROL_CAPTURE_INTENT, CaptureRequest.CONTROL_CAPTURE_INTENT_VIDEO_RECORD);

			camera_settings.setupBuilder(previewBuilder, false);