diff options
| author | Yoann Lopes <yoann.lopes@digia.com> | 2014-03-13 19:32:15 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-17 14:46:53 +0100 |
| commit | eec1381606506f80576dc621a7d83328ca18468b (patch) | |
| tree | 10ed92b7268f4fc88320d343fa808bf41e5bc17c /src/multimedia/camera | |
| parent | 7272efc936354f7771286825e8f3cf82e7bcba46 (diff) | |
Fix crash in QCameraInfo when no camera is available on the system.
Change-Id: I04bea9d6afcf567c64788c3765cc6626dc9cd482
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Diffstat (limited to 'src/multimedia/camera')
| -rw-r--r-- | src/multimedia/camera/qcamerainfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/camera/qcamerainfo.cpp b/src/multimedia/camera/qcamerainfo.cpp index 218219c7e..230b71222 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); |