From eec1381606506f80576dc621a7d83328ca18468b Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Thu, 13 Mar 2014 19:32:15 +0100 Subject: [PATCH] Fix crash in QCameraInfo when no camera is available on the system. Change-Id: I04bea9d6afcf567c64788c3765cc6626dc9cd482 Reviewed-by: Christian Stromme --- src/multimedia/camera/qcamerainfo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/multimedia/camera/qcamerainfo.cpp b/src/multimedia/camera/qcamerainfo.cpp index 218219c..230b712 100644 --- a/src/multimedia/camera/qcamerainfo.cpp +++ b/src/multimedia/camera/qcamerainfo.cpp @@ -104,7 +104,7 @@ QCameraInfo::QCameraInfo(const QCamera &camera) : d(new QCameraInfoPrivate) { const QVideoDeviceSelectorControl *deviceControl = camera.d_func()->deviceControl; - if (deviceControl) { + if (deviceControl && deviceControl->deviceCount() > 0) { const int selectedDevice = deviceControl->selectedDevice(); d->deviceName = deviceControl->deviceName(selectedDevice); d->description = deviceControl->deviceDescription(selectedDevice); -- 2.7.4