From 762bce7a06de20d87425a363a83a01bd0be9159a Mon Sep 17 00:00:00 2001
From: Yoann Lopes <yoann.lopes@theqtcompany.com>
Date: Mon, 1 Jun 2015 18:09:30 +0200
Subject: AVFoundation: fix wrong Q_ASSERT.

The assert was always triggered, at least on OSX.

Change-Id: I9aabb6103b7f5540cff42facc448ffcf6a6de511
Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
---
 src/plugins/avfoundation/camera/avfcameraflashcontrol.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/avfoundation/camera/avfcameraflashcontrol.mm b/src/plugins/avfoundation/camera/avfcameraflashcontrol.mm
index 0eef95e92..89c7a2eb6 100644
--- a/src/plugins/avfoundation/camera/avfcameraflashcontrol.mm
+++ b/src/plugins/avfoundation/camera/avfcameraflashcontrol.mm
@@ -157,7 +157,7 @@ void AVFCameraFlashControl::cameraStateChanged(QCamera::State newState)
 
 bool AVFCameraFlashControl::applyFlashSettings()
 {
-    Q_ASSERT(m_session->state() == QCamera::ActiveState);
+    Q_ASSERT(m_session->requestedState() == QCamera::ActiveState);
 
     AVCaptureDevice *captureDevice = m_session->videoCaptureDevice();
     if (!captureDevice) {
-- 
cgit v1.2.1