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

AVFoundation: fix wrong Q_ASSERT.

Browse Source 
The assert was always triggered, at least on OSX.

Change-Id: I9aabb6103b7f5540cff42facc448ffcf6a6de511
Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
This commit is contained in:
Yoann Lopes
2015-06-01 18:09:30 +02:00
committed by Jani Heikkinen
parent 1508f775ac
commit 762bce7a06
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/avfoundation/camera/avfcameraflashcontrol.mm
View File

@@ -157,7 +157,7 @@ void AVFCameraFlashControl::cameraStateChanged(QCamera::State newState)
bool AVFCameraFlashControl::applyFlashSettings() bool AVFCameraFlashControl::applyFlashSettings()
{ {
Q_ASSERT(m_session->state() == QCamera::ActiveState); Q_ASSERT(m_session->requestedState() == QCamera::ActiveState);
AVCaptureDevice *captureDevice = m_session->videoCaptureDevice(); AVCaptureDevice *captureDevice = m_session->videoCaptureDevice();
if (!captureDevice) { if (!captureDevice) {