diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-06-01 18:09:30 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-06-02 07:31:27 +0000 |
| commit | 762bce7a06de20d87425a363a83a01bd0be9159a (patch) | |
| tree | 6b7542786f33ef887539d687084acbbea3605cb2 | |
| parent | 1508f775acfd7aad18e71dde35c3ff0c9b073fc1 (diff) | |
| download | qtmultimedia-762bce7a06de20d87425a363a83a01bd0be9159a.tar.gz | |
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>
| -rw-r--r-- | src/plugins/avfoundation/camera/avfcameraflashcontrol.mm | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |