slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix crash in QCameraInfo when no camera is available on the system.

Browse Source 
Change-Id: I04bea9d6afcf567c64788c3765cc6626dc9cd482
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
This commit is contained in:
Yoann Lopes
2014-03-13 19:32:15 +01:00
committed by The Qt Project
parent 7272efc936
commit eec1381606
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/multimedia/camera/qcamerainfo.cpp
View File

@@ -104,7 +104,7 @@ QCameraInfo::QCameraInfo(const QCamera &camera)
: d(new QCameraInfoPrivate) : d(new QCameraInfoPrivate)
{ {
const QVideoDeviceSelectorControl *deviceControl = camera.d_func()->deviceControl; const QVideoDeviceSelectorControl *deviceControl = camera.d_func()->deviceControl;
if (deviceControl) { if (deviceControl && deviceControl->deviceCount() > 0) {
const int selectedDevice = deviceControl->selectedDevice(); const int selectedDevice = deviceControl->selectedDevice();
d->deviceName = deviceControl->deviceName(selectedDevice); d->deviceName = deviceControl->deviceName(selectedDevice);
d->description = deviceControl->deviceDescription(selectedDevice); d->description = deviceControl->deviceDescription(selectedDevice);