From b3af8f65fcaef66504f5640ccaa2972e17af1af0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Str=C3=B8mme?= Date: Tue, 24 May 2016 18:54:38 +0200 Subject: Android: Fix crash in AndroidCamere::open() We would attempt to delete the AndroidCameraPrivate object twice if the native call to open failed. On recent version of Android (~6.0), this problem is harder to reproduce, as the camera is properly released when the application goes into the background. Task-number: QTBUG-53536 Change-Id: I064d276f9025924dfdb071aa52311d2b553c6953 Reviewed-by: Yoann Lopes --- src/plugins/android/src/wrappers/jni/androidcamera.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/plugins/android/src/wrappers') diff --git a/src/plugins/android/src/wrappers/jni/androidcamera.cpp b/src/plugins/android/src/wrappers/jni/androidcamera.cpp index 23200462e..009ab70b9 100644 --- a/src/plugins/android/src/wrappers/jni/androidcamera.cpp +++ b/src/plugins/android/src/wrappers/jni/androidcamera.cpp @@ -302,7 +302,6 @@ AndroidCamera *AndroidCamera::open(int cameraId) if (!ok) { worker->quit(); worker->wait(5000); - delete d; delete worker; return 0; } -- cgit v1.2.3